[gtpd-cvs] gtkpod/src display_itdb.c,1.41,1.42 file_itunesdb.c,1.78,1.79 info.c,1.34,1.35 misc_confirm.c,1.26,1.27 misc_track.c,1.33,1.34

[<jc...@us...>]

Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14013/src

Modified Files:
	display_itdb.c file_itunesdb.c info.c misc_confirm.c 
	misc_track.c 
Log Message:
	 * file_itunesdb.c (gp_import_itdb): correct has_artwork flag
           (formerly flag1) for each track if unset or potentially set
           incorrectly.

	 * bumped version to 0.99.6CVS



Index: display_itdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_itdb.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- display_itdb.c	16 Mar 2006 15:38:09 -0000	1.41
+++ display_itdb.c	5 Apr 2006 14:07:22 -0000	1.42
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-03-16 23:52:05 jcs>
+/* Time-stamp: <2006-04-01 01:32:08 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -687,6 +687,8 @@
    playlist @pl. It then lets the display model know.
    @display: if TRUE, track is added the display.  Otherwise it's only
    added to memory */
+/* All tracks added to the podcast playlist will get the mark_unplayed
+   flag get set */
 void gp_playlist_add_track (Playlist *pl, Track *track, gboolean display)
 {
     iTunesDB *itdb;
@@ -696,7 +698,12 @@
     itdb = pl->itdb;
     g_return_if_fail (itdb);
 
-    pl->members = g_list_append (pl->members, track);
+    itdb_playlist_add_track (pl, track, -1);
+    if (itdb_playlist_is_podcasts (pl))
+    {   /* have the iPod display a bullet in front of the track as it
+	   has been newly added */
+	track->mark_unplayed = 0x02;
+    }
     if (display)  pm_add_track (pl, track, TRUE);
 
     data_changed (itdb);

Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- file_itunesdb.c	17 Mar 2006 16:28:10 -0000	1.78
+++ file_itunesdb.c	5 Apr 2006 14:07:22 -0000	1.79
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-03-18 00:31:20 jcs>
+/* Time-stamp: <2006-04-04 00:08:13 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -597,9 +597,19 @@
 	g_return_val_if_fail (etr, (release_widgets(), NULL));
 	fill_in_extended_info (track, total, num);
 	gp_track_validate_entries (track);
-	/* set new default value for flag1 (unknown) */
-	if (track->flag1 == 0)
-	    track->flag1 = 0x02;
+	/* properly set value for has_artwork */
+	if ((track->has_artwork == 0x00) ||
+	    ((track->has_artwork == 0x02) &&
+	     (extendedinfoversion > 0.0) && (extendedinfoversion <= 0.99)))
+	{   /* if has_artwork is not set (0x00), or it has been
+	       (potentially wrongly) set to 0x02 by gtkpod V0.99 or
+	       smaller, determine the correct(?) value */
+	    if (track->artwork->thumbnails)
+		track->has_artwork = 0x01;
+	    else
+		track->has_artwork = 0x02;
+	}
+
 	/* set unk208 to audio if unset (important only for iPod Video) */
 	if (track->unk208 == 0)
 	    track->unk208 = 0x00000001;

Index: info.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/info.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- info.c	26 Nov 2005 13:44:41 -0000	1.34
+++ info.c	5 Apr 2006 14:07:22 -0000	1.35
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-25 23:52:12 jcs>
+/* Time-stamp: <2006-03-30 23:23:34 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -529,7 +529,7 @@
 
 /* we'll use statvfs to determine free space on the iPod where
    available, df otherwise */
-#ifdef HAVE_statvfs
+#ifdef HAVE_STATVFS
 #include <sys/types.h>
 #include <sys/statvfs.h>
 /* update space_ipod_free and space_ipod_used */

Index: misc_confirm.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_confirm.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- misc_confirm.c	29 Mar 2006 14:42:11 -0000	1.26
+++ misc_confirm.c	5 Apr 2006 14:07:22 -0000	1.27
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-03-29 23:35:27 jcs>
+/* Time-stamp: <2006-03-30 23:23:33 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -40,7 +40,7 @@
 #include "prefs.h"
 #include "info.h"
 
-#ifdef HAVE_statvfs
+#ifdef HAVE_STATVFS
 #include <sys/types.h>
 #include <sys/statvfs.h>
 #endif
@@ -843,7 +843,7 @@
 static gint ipod_directories_number (gchar *mp)
 {
     const gint default_nr = 20;
-#ifdef HAVE_statvfs
+#ifdef HAVE_STATVFS
     struct statvfs stat;
     int	status;
     gdouble size;

Index: misc_track.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- misc_track.c	10 Dec 2005 17:04:29 -0000	1.33
+++ misc_track.c	5 Apr 2006 14:07:22 -0000	1.34
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-11 02:00:14 jcs>
+/* Time-stamp: <2006-04-04 00:08:13 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -1423,7 +1423,6 @@
 void gp_track_set_flags_podcast (Track *track)
 {
     g_return_if_fail (track);
-    track->flag1 = 0x02;  /* unknown */
     track->flag2 = 0x01;  /* skip when shuffling */
     track->flag3 = 0x01;  /* remember playback position */
     track->flag4 = 0x01;  /* Show Title/Album on the 'Now Playing' page */
@@ -1433,7 +1432,6 @@
 void gp_track_set_flags_default (Track *track)
 {
     g_return_if_fail (track);
-    track->flag1 = 0x02;  /* unknown */
     track->flag2 = 0x00;  /* do not skip when shuffling */
     track->flag3 = 0x00;  /* do not remember playback position */
     track->flag4 = 0x00;  /* Show Title/Album/Artist on the 'Now