Re: [Bug-gnupod] 4th generation iPod Nano

[Richard van den Berg]

On 5/27/09 11:47 PM, Richard van den Berg wrote:
> I'll post a full patch including the documentation side later.
>   

Here is the patch to make the artwork work for the 4th generation iPod Nano.

Cheers,

Richard

? .gnupod_version
? Makefile
? autom4te.cache
? config.log
? config.status
? configure
? nano_4g
Index: doc/gnupod.html
===================================================================
RCS file: /sources/gnupod/gnupod/doc/gnupod.html,v
retrieving revision 1.34
diff -u -r1.34 gnupod.html
--- doc/gnupod.html     17 Feb 2008 09:14:04 -0000      1.34
+++ doc/gnupod.html     28 May 2009 19:11:42 -0000
@@ -943,7 +943,7 @@
 <!--docid::SEC17::-->
 <P>
 
-GNUpod can write cover artwork for video, nano and late 2007-nano iPods. The 
internal image format is model specific, so you should give 
+GNUpod can write cover artwork for video and nano iPods. The internal image 
format is model specific, so you should give 
 GNUpod a hint about the image format it should use.
 </P><P>
 
@@ -954,6 +954,8 @@
 <TABLE><tr><td>&nbsp;</td><td class=example><pre>model = nano
 </pre></td></tr></table>Late 2007-nanos need this setting:
 <TABLE><tr><td>&nbsp;</td><td class=example><pre>model = nano_3g
+</pre></td></tr></table>Late 2008-nanos need this setting:
+<TABLE><tr><td>&nbsp;</td><td class=example><pre>model = nano_4g
 </pre></td></tr></table></P><P>
 
 To specify a cover while adding files you'd use the <CODE>--artwork</CODE> 
switch of <CODE>gnupod_addsong.pl</CODE>. Example:
Index: doc/gnupod.info
===================================================================
RCS file: /sources/gnupod/gnupod/doc/gnupod.info,v
retrieving revision 1.33
diff -u -r1.33 gnupod.info
--- doc/gnupod.info     17 Feb 2008 09:14:04 -0000      1.33
+++ doc/gnupod.info     28 May 2009 19:11:42 -0000
@@ -667,6 +667,8 @@
      model = nano
    Late 2007-nanos need this setting:
      model = nano_3g
+   Late 2008-nanos need this setting:
+     model = nano_4g
 
    To specify a cover while adding files you'd use the `--artwork'
 switch of `gnupod_addsong.pl'. Example:
Index: doc/gnupod.texi
===================================================================
RCS file: /sources/gnupod/gnupod/doc/gnupod.texi,v
retrieving revision 1.41
diff -u -r1.41 gnupod.texi
--- doc/gnupod.texi     24 Mar 2009 16:54:41 -0000      1.41
+++ doc/gnupod.texi     28 May 2009 19:11:43 -0000
@@ -684,7 +684,7 @@
 @node Adding cover artwork
 @section Adding cover artwork
 
-GNUpod can write cover artwork for video, nano and late 2007-nano iPods. The 
internal image format is model specific, so you should give 
+GNUpod can write cover artwork for video and nano iPods. The internal image 
format is model specific, so you should give 
 GNUpod a hint about the image format it should use.
 
 If you own a video (compatible) iPod, set:
@@ -700,6 +700,10 @@
 @example
 model = nano_3g
 @end example
+Late 2008-nanos need this setting:
address@hidden
+model = nano_4g
address@hidden example
 
 
 To specify a cover while adding files you'd use the @address@hidden switch of 
@address@hidden Example:
Index: doc/gnupodrc.example
===================================================================
RCS file: /sources/gnupod/gnupod/doc/gnupodrc.example,v
retrieving revision 1.6
diff -u -r1.6 gnupodrc.example
--- doc/gnupodrc.example        28 Nov 2007 06:21:19 -0000      1.6
+++ doc/gnupodrc.example        28 May 2009 19:11:43 -0000
@@ -19,6 +19,7 @@
 ## * video   (default)
 ## * nano    (pre-2007 nanos)
 ## * nano_3g (the late 2007 nano)
+## * nano_4g (the late 2008 nano)
 # model = video
 
 ## Let GNUpod call mktunes.pl itself.
Index: src/ext/ArtworkDB.pm
===================================================================
RCS file: /sources/gnupod/gnupod/src/ext/ArtworkDB.pm,v
retrieving revision 1.21
diff -u -r1.21 ArtworkDB.pm
--- src/ext/ArtworkDB.pm        2 Feb 2008 11:30:38 -0000       1.21
+++ src/ext/ArtworkDB.pm        28 May 2009 19:11:43 -0000
@@ -35,7 +35,10 @@
 use constant MODE_PARSED    => 300;
 
        # Artwork profiles:
-       my $profiles = { 'nano_3g' => [ { height=>320, width=>320, 
storage_id=>1060, bpp=>16,  },  { height=>128, width=>128, storage_id=>1055, 
bpp=>16, },
+       my $profiles = { 'nano_4g' => [ { height=>128, width=>128, 
storage_id=>1055, bpp=>16,  }, { height=>128, width=>128, storage_id=>1068, 
bpp=>16,  },
+                                       { height=>240, width=>240, 
storage_id=>1071, bpp=>16,  }, { height=>50,  width=>50,  storage_id=>1074, 
bpp=>16,  },
+                                       { height=>80,  width=>80,  
storage_id=>1078, bpp=>16,  }, { height=>240, width=>240, storage_id=>1084, 
bpp=>16,  },  ],
+                        'nano_3g' => [ { height=>320, width=>320, 
storage_id=>1060, bpp=>16,  }, { height=>128, width=>128, storage_id=>1055, 
bpp=>16,  },
                                        { height=>56,  width=>56,  
storage_id=>1061, bpp=>16, drop=>112}                                           
          ],
                         'classic' => [ { height=>320, width=>320, 
storage_id=>1060, bpp=>16,  },  { height=>128, width=>128, storage_id=>1055, 
bpp=>16, },
                                        { height=>56,  width=>56,  
storage_id=>1061, bpp=>16, drop=>112}                                           
          ],