* src/itdb_track.c: include thumbnails into itdb_track_duplicate()

(Christophe Fergeau)

* src/db-image-parser.c: support for iPod nano (Christophe
Fergeau)

* configure.c: make MacOS compatible (Tristan O'Tierney)

git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1109 f01d2545-417e-4e96-918e-98f8d0dbbcb6

3 files changed, 40 insertions, 6 deletions

diff --git a/src/db-artwork-parser.h b/src/db-artwork-parser.h
index aaeabff..550f9c0 100644
--- a/src/db-artwork-parser.h
+++ b/src/db-artwork-parser.h
@@ -32,6 +32,9 @@
 
 #define IPOD_THUMBNAIL_FULL_SIZE_CORRELATION_ID 1016
 #define IPOD_THUMBNAIL_NOW_PLAYING_CORRELATION_ID 1017
+#define IPOD_NANO_THUMBNAIL_FULL_SIZE_CORRELATION_ID 1027
+#define IPOD_NANO_THUMBNAIL_NOW_PLAYING_CORRELATION_ID 1031
+
 
 G_GNUC_INTERNAL int ipod_parse_photo_db (const char *filename);
 G_GNUC_INTERNAL int ipod_parse_artwork_db (Itdb_iTunesDB *db);
diff --git a/src/db-image-parser.c b/src/db-image-parser.c
index b04cec6..3842135 100644
--- a/src/db-image-parser.c
+++ b/src/db-image-parser.c
@@ -159,13 +159,16 @@ ipod_image_new_from_mhni (MhniHeader *mhni, const char *mount_point)
 	img->width = (GINT_FROM_LE (mhni->image_dimensions) & 0xffff0000) >> 16;
 	img->height = (GINT_FROM_LE (mhni->image_dimensions) & 0x0000ffff);
 
-	if (mhni->correlation_id == IPOD_THUMBNAIL_FULL_SIZE_CORRELATION_ID) {
+	switch (mhni->correlation_id) {
+	case IPOD_THUMBNAIL_FULL_SIZE_CORRELATION_ID:
+	case IPOD_NANO_THUMBNAIL_FULL_SIZE_CORRELATION_ID:
 		img->type = ITDB_IMAGE_FULL_SCREEN;
-	} else if (mhni->correlation_id == IPOD_THUMBNAIL_NOW_PLAYING_CORRELATION_ID)
-	{
+		break;
+	case IPOD_THUMBNAIL_NOW_PLAYING_CORRELATION_ID:
+	case IPOD_NANO_THUMBNAIL_NOW_PLAYING_CORRELATION_ID:
 		img->type = ITDB_IMAGE_NOW_PLAYING;
-			
-	} else {
+		break;
+	default:
 		g_print ("Unrecognized image size: %08x\n", 
 			 GINT_FROM_LE (mhni->image_dimensions));
 		g_free (img);
diff --git a/src/itdb_track.c b/src/itdb_track.c
index 773d0e2..34495b3 100644
--- a/src/itdb_track.c
+++ b/src/itdb_track.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-09-24 12:21:06 jcs>
+/* Time-stamp: <2005-09-29 00:01:38 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -215,6 +215,30 @@ void itdb_track_unlink (Itdb_Track *track)
     track->itdb = NULL;
 }
 
+static GList *dup_thumbnails (GList *thumbnails)
+{
+    GList *it;
+    GList *result;
+    
+    result = NULL;
+    for (it = thumbnails; it != NULL; it = it->next)
+    {
+	Itdb_Image *new_image;
+	Itdb_Image *image;
+
+	image = (Itdb_Image *)it->data;
+	g_return_val_if_fail (image, NULL);
+
+	new_image = g_new0 (Itdb_Image, 1);
+	memcpy (new_image, image, sizeof (Itdb_Image));
+	new_image->filename = g_strdup (image->filename);
+	
+	result = g_list_prepend (result, new_image);
+    }
+
+    return g_list_reverse (result);
+}
+
 /* Duplicate an existing track */
 Itdb_Track *itdb_track_duplicate (Itdb_Track *tr)
 {
@@ -252,6 +276,10 @@ Itdb_Track *itdb_track_duplicate (Itdb_Track *tr)
 		tr->chapterdata_raw_length);
     }
 
+    /* Copy thumbnail data */
+    tr_dup->orig_image_filename = g_strdup (tr->orig_image_filename);
+    tr_dup->thumbnails = dup_thumbnails (tr->thumbnails);
+
     /* Copy userdata */
     if (tr->userdata && tr->userdata_duplicate)
 	tr_dup->userdata = tr->userdata_duplicate (tr->userdata);