Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13305/src
Modified Files:
file.c misc_track.c syncdir.c
Log Message:
* src/syncdir.c (sync_playlist): clean up
'updated/non-updated/duplicate' lists so they don't pop up
unexpectedly at a later time.
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -d -r1.187 -r1.188
--- file.c 21 Sep 2006 15:03:13 -0000 1.187
+++ file.c 24 Sep 2006 06:42:52 -0000 1.188
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-21 22:56:13 jcs>
+/* Time-stamp: <2006-09-24 15:25:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1524,9 +1524,9 @@
calling display_non_updated ((void *)-1, NULL);
It is also possible that duplicates get detected in the process --
- a list of those can be displayed by calling "remove_duplicate
+ a list of those can be displayed by calling "gp_duplicate_remove
(NULL, NULL)", that list can be deleted by calling
- "remove_duplicate (NULL, (void *)-1)"*/
+ "gp_duplicate_remove (NULL, (void *)-1)"*/
void update_track_from_file (iTunesDB *itdb, Track *track)
{
ExtraTrackData *etr;
Index: misc_track.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- misc_track.c 21 Sep 2006 15:03:13 -0000 1.51
+++ misc_track.c 24 Sep 2006 06:42:52 -0000 1.52
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-21 23:51:06 jcs>
+/* Time-stamp: <2006-09-24 15:25:29 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -333,7 +333,7 @@
/**
* Register all tracks in the md5 hash and remove duplicates (while
* preserving playlists).
- * Call remove_duplicate (NULL, NULL); to show an info dialogue
+ * Call gp_duplicate_remove (NULL, NULL); to show an info dialogue
*/
void gp_itdb_hash (iTunesDB *itdb)
{
Index: syncdir.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/syncdir.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- syncdir.c 2 Sep 2006 03:27:12 -0000 1.6
+++ syncdir.c 24 Sep 2006 06:42:52 -0000 1.7
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-09-01 22:30:24 jcs>
+/* Time-stamp: <2006-09-24 15:25:27 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -561,6 +561,11 @@
afd.playlist = playlist;
afd.tracks_updated = &tracks_updated;
g_hash_table_foreach (dirs_hash, add_files, &afd);
+ /* Remove updated and duplicate list so it won't pop up at a later
+ time */
+ display_updated ((void *)-1, NULL);
+ display_non_updated ((void *)-1, NULL);
+ gp_duplicate_remove (NULL, (void *)-1);
/* Should tracks be deleted that were not present in the
* directories? */
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
