[Pkg-gtkpod-devel] r172 - in gtkpod/trunk: debian src

[Frank Lichtenheld]

Author: djpig
Date: 2007-01-25 23:38:58 +0100 (Thu, 25 Jan 2007)
New Revision: 172

Modified:
   gtkpod/trunk/debian/changelog
   gtkpod/trunk/debian/control
   gtkpod/trunk/src/file.c
   gtkpod/trunk/src/file_itunesdb.c
Log:
Adapt for libgpod >= 0.4.2


Modified: gtkpod/trunk/debian/changelog
===================================================================
--- gtkpod/trunk/debian/changelog	2007-01-25 11:17:57 UTC (rev 171)
+++ gtkpod/trunk/debian/changelog	2007-01-25 22:38:58 UTC (rev 172)
@@ -1,3 +1,10 @@
+gtkpod (0.99.8-2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Adapt for libgpod >= 0.4.2 (Patch by upstream).
+
+ -- Frank Lichtenheld <djpig at debian.org>  Fri, 22 Dec 2006 19:09:44 +0100
+
 gtkpod (0.99.8-1) experimental; urgency=low
 
   * New upstream release

Modified: gtkpod/trunk/debian/control
===================================================================
--- gtkpod/trunk/debian/control	2007-01-25 11:17:57 UTC (rev 171)
+++ gtkpod/trunk/debian/control	2007-01-25 22:38:58 UTC (rev 172)
@@ -2,7 +2,7 @@
 Section: sound
 Priority: extra
 Maintainer: Frank Lichtenheld <djpig at debian.org>
-Build-Depends: debhelper (>= 4.2.21), gettext, flex, autotools-dev, perl, libgtk2.0-dev, libglade2-dev, libid3tag0-dev, libgpod-dev (>= 0.4.0)
+Build-Depends: debhelper (>= 4.2.21), gettext, flex, autotools-dev, perl, libgtk2.0-dev, libglade2-dev, libid3tag0-dev, libgpod-dev (>= 0.4.2)
 Standards-Version: 3.7.2
 
 Package: gtkpod

Modified: gtkpod/trunk/src/file.c
===================================================================
--- gtkpod/trunk/src/file.c	2007-01-25 11:17:57 UTC (rev 171)
+++ gtkpod/trunk/src/file.c	2007-01-25 22:38:58 UTC (rev 172)
@@ -851,7 +851,7 @@
     to->time_modified = from->time_modified;
     to->year = from->year;
     to->compilation = from->compilation;
-    to->unk208 = from->unk208;
+    to->mediatype = from->mediatype;
     to->lyrics_flag = from->lyrics_flag;
     to->movie_flag = from->movie_flag;
 }
@@ -1069,25 +1069,25 @@
     {
     case FILE_TYPE_MP3:
 	nti = mp3_get_file_info (name);
-	/* Set unk208 to audio */
-	if (nti) nti->unk208 = 0x00000001;
+	/* Set mediatype to audio */
+	if (nti) nti->mediatype = 0x00000001;
 	break;
     case FILE_TYPE_M4A:
     case FILE_TYPE_M4P:
     case FILE_TYPE_M4B:
 	nti = mp4_get_file_info (name);
-	/* Set unk208 to audio */
+	/* Set mediatype to audio */
 	if (nti)
 	{
-	    nti->unk208 = 0x00000001;
+	    nti->mediatype = 0x00000001;
 	}
 	break;
     case FILE_TYPE_WAV:
 	nti = wav_get_file_info (name);
-	/* Set unk208 to audio */
+	/* Set mediatype to audio */
 	if (nti)
 	{
-	    nti->unk208 = 0x00000001;
+	    nti->mediatype = 0x00000001;
 	}
 	break;
     case FILE_TYPE_M4V:
@@ -1096,10 +1096,10 @@
 	   this. Let's see if someone complains. */
 	nti = mp4_get_file_info (name);
 	if (!nti) video_get_file_info (name);
-	/* Set unk208 to video */
+	/* Set mediatype to video */
 	if (nti)
 	{
-	    nti->unk208 = 0x00000002;
+	    nti->mediatype = 0x00000002;
 	    nti->movie_flag = 0x01;
 	}	
 	break;
@@ -1107,10 +1107,10 @@
     case FILE_TYPE_MPG:
 	/* for now treat all the same */
 	nti = video_get_file_info (name);
-	/* Set unk208 to video */
+	/* Set mediatype to video */
 	if (nti)
 	{
-	    nti->unk208 = 0x00000002;
+	    nti->mediatype = 0x00000002;
 	    nti->movie_flag = 0x01;
 	}
 	break;

Modified: gtkpod/trunk/src/file_itunesdb.c
===================================================================
--- gtkpod/trunk/src/file_itunesdb.c	2007-01-25 11:17:57 UTC (rev 171)
+++ gtkpod/trunk/src/file_itunesdb.c	2007-01-25 22:38:58 UTC (rev 172)
@@ -589,9 +589,9 @@
 		track->has_artwork = 0x02;
 	}
 
-	/* set unk208 to audio if unset (important only for iPod Video) */
-	if (track->unk208 == 0)
-	    track->unk208 = 0x00000001;
+	/* set mediatype to audio if unset (important only for iPod Video) */
+	if (track->mediatype == 0)
+	    track->mediatype = 0x00000001;
 	/* restore deleted thumbnails */
 	if ((track->artwork->thumbnails == NULL) &&
 	    (strlen (etr->thumb_path_locale) != 0))