Commits

Wez Furlong  committed 9183fff Merge

Merged in Foosatraz/wez-atomicparsley-foosatraz-fork/wez_pull_request_cleaner (pull request #13)

Fix for Issue #32, iTunes 11 Movies stik value. also Issue #23.

  • Participants
  • Parent commits 18897d2, 74e8a9d

Comments (0)

Files changed (7)

 7ef2c4f434cb85101ef9c5b7f4bf517c3287f1e0 0.9.3
 36099586d4c238c643db208496048799b98e3412 0.9.4
 d9f7d6ea607a09506a4537c5df2db06d8fd92e57 0.9.5
+da2f6e4fc1206a330b0324a80606c25e2e5ce7b6 0.9.6
 Copyright (C) 2011, John D Pell
 Copyright (C) 2010, Edriss Mirzadeh
 Copyright (C) 2009, Josh Aune
+Copyright (C) 2014, Paul Foose
 
 Miscellaneous Contributions made at unknown (to the current maintainers) times,
 except that the changes are presumably circa 2005-2007:
 
 update mvhd/tkhd modification timestamps
 
-# vim:ts=2:sw=2:et:
+v0.9.6  02/22/2014
+
+update for iTunes 11 compatibility
+if stik "Movie" is used, set value to 9, instead of 0
+iTunes now views stick value 0 as "Home Video"
+left "Short Film" to also set stik 9, for backward compatibility with work-arounds using "Short Film" to set stik to 9
+
+Swapped TV-Y and TV-Y7 to conform with iTunes usage.
+
+
 
 
 ## For Windows users:
+AtomicParsley builds under cygwin and/or mingw using the same procedure as above.
 
-AtomicParsley builds under cygwin and/or mingw using the same procedure
-as above.
+Foosatraz built in Windows 8 using MinGW.
+
+MinGW-get version 0.6.2-beta-20131004-1
+
+mingw-libz version 1.2.8-1 from MinGW Installation Manager
+
+      % ./autogen.sh
+      % ./configure --prefix=/mingw
+      % make LDFLAGS=-static
+      % strip AtomicParsley.exe
+
+Full details [pdf](https://bitbucket.org/Foosatraz/wez-atomicparsley-foosatraz-fork/downloads/AtomicParsleyMinGWBuildNotebook.pdf)
 
 To build with MSVC, you will need to create your own project file; look
 at the list of source files in Makefile.am; you need to add all of the
 source files *except* the .mm files.  You will also need to provide your
 own zlib.
 
-If you don't want to build it yourself, Jon Hedgrows' forks maintains
-pre-built Windows binaries:
-
+If you don't want to build it yourself, [Jon Hedgrows' fork ](https://bitbucket.org/jonhedgerows/atomicparsley/wiki/Home) maintains pre-built Windows binaries of the Wez fork:
 [Windows Downloads](https://bitbucket.org/jonhedgerows/atomicparsley/downloads)
 
-<!-- vim:ts=2:sw=2:et:
--->

File configure.ac

 
 AC_PREREQ(2.50)
 
-AC_INIT([atomicparsley],[0.9.5],
+AC_INIT([atomicparsley],[0.9.6],
   [http://bitbucket.org/wez/atomicparsley/issues/new/])
   
 dnl Need to disable dependency tracking option so that the universal

File src/arrays.cpp

 }; */  //apparently the other winamp id3v1 extensions aren't valid
 
 stiks stikArray[] = {
-	{ "Movie", 0 },
+	{ "Home Video", 0 },
 	{ "Normal", 1 },
 	{ "Audiobook", 2 },
 	{ "Whacked Bookmark", 5 },
 	{ "Music Video", 6 },
+	{ "Movie", 9 },
 	{ "Short Film", 9 },
 	{ "TV Show", 10 },
 	{ "Booklet", 11 }
 	{ "us-tv|TV-14|500|",  "TV-14" },
 	{ "us-tv|TV-PG|400|",  "TV-PG" },
 	{ "us-tv|TV-G|300|",   "TV-G" },
-	{ "us-tv|TV-Y|200|",   "TV-Y" },
-	{ "us-tv|TV-Y7|100|",  "TV-Y7" },
+	{ "us-tv|TV-Y7|200|",  "TV-Y7" },
+	{ "us-tv|TV-Y|100|",   "TV-Y" },
 	//{ "us-tv||0|",         "not-applicable" }, //though its a valid flag & some files have this, AP won't be setting it.
 	{ "mpaa|UNRATED|600|",  "Unrated" },
 	{ "mpaa|NC-17|500|",    "NC-17" },

File src/main.cpp

 "  --cnID             ,       (num)    Set iTunes Catalog ID, used for combining SD and HD encodes in iTunes on the \"cnID\" atom\n"
 "\n"
 "                                      To combine you must set \"hdvd\" atom on one file and must have same \"stik\" on both file\n"
-"                                      Must not use \"stik\" of value Movie(0), use Short Film(9)\n"
+"                                      Must not use \"stik\" of value Home Video(0), use Movie(9)\n"
 "\n"
 "                                      iTunes Catalog numbers can be obtained by finding the item in the iTunes Store.  Once item\n"
 "                                      is found in the iTunes Store right click on picture of item and select copy link.  Paste this link\n"