Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18434/src
Modified Files:
display_coverart.c file_itunesdb.c details.c fileselection.c
display_playlists.c misc_confirm.c display_coverart.h
Log Message:
2007-02-27 P.G. Richardson <phantom_sf at users.sourceforge.net>
* display_coverart.c: Changed coverart_set_images to internally
get the playlist and checks whether the
playlist is null
or not. Thus, all calls to
coverart_set_images require
no checking of parameters beforehand.
* details.c,
display_playlists.c
file_itunesdb.c
fileselection.c
misc_confirm.c: functions updated to call modified version of
coverart_set_images. data_changed
function no longer calls
coverart_set_images since this is used in too
many other places where setting
coverart is
unnecessary and error prone.
Index: display_coverart.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_coverart.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- display_coverart.c 24 Feb 2007 06:24:10 -0000 1.6
+++ display_coverart.c 27 Feb 2007 22:42:44 -0000 1.7
@@ -1097,10 +1097,12 @@
* @tracks: list of tracks taken from a playlist
*
*/
-void coverart_set_images (GList *tracks)
+void coverart_set_images ()
{
gint i;
+ GList *tracks;
Itdb_Track *track;
+ Playlist *playlist;
/* initialize display if not already done */
if (!cdwidget) coverart_init_display();
@@ -1110,8 +1112,17 @@
*/
if (cdwidget->block_display_change)
return;
-
+
+ /* Reset the display back to black, black and more black */
coverart_clear_images ();
+
+ /* Find the selected playlist */
+ playlist = pm_get_selected_playlist ();
+ if (playlist == NULL)
+ return;
+
+ tracks = playlist->members;
+
cdwidget->first_imgindex = 0;
g_list_free (cdwidget->displaytracks);
Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- file_itunesdb.c 24 Feb 2007 05:48:33 -0000 1.111
+++ file_itunesdb.c 27 Feb 2007 22:42:44 -0000 1.112
@@ -2050,10 +2050,6 @@
eitdb->data_changed = TRUE;
pm_name_changed (itdb_playlist_mpl (itdb));
space_data_update ();
-
- /* data has been modified so re-initialise the coverart display */
- Playlist *plitem = pm_get_selected_playlist ();
- coverart_set_images (plitem->members);
}
Index: details.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/details.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- details.c 5 Feb 2007 00:21:39 -0000 1.19
+++ details.c 27 Feb 2007 22:42:44 -0000 1.20
@@ -383,8 +383,11 @@
detail->changed = FALSE;
if (changed)
- data_changed (detail->itdb);
-
+ {
+ data_changed (detail->itdb);
+ coverart_set_images ();
+ }
+
details_update_headline (detail);
details_update_buttons (detail);
Index: fileselection.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/fileselection.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- fileselection.c 20 Feb 2007 14:11:24 -0000 1.14
+++ fileselection.c 27 Feb 2007 22:42:44 -0000 1.15
@@ -130,7 +130,7 @@
gtkpod_statusbar_message (_("Some files were not added successfully"));
/* Reinitialise coverart display for selected playlist */
- coverart_set_images (playlist->members);
+ coverart_set_images ();
/* Clean up the names list */
delete_file_list(names);
@@ -687,7 +687,7 @@
prefs_set_string ("last_dir_browsed", dir);
gtkpod_tracks_statusbar_update();
/* Reinitialise coverart display for selected playlist */
- coverart_set_images (plitem->members);
+ coverart_set_images ();
}
else
{
Index: display_playlists.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_playlists.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- display_playlists.c 22 Feb 2007 23:50:45 -0000 1.97
+++ display_playlists.c 27 Feb 2007 22:42:44 -0000 1.98
@@ -1420,10 +1420,7 @@
coverart_block_change (FALSE);
/* Set the coverart display based on the selected playlist */
- if (new_playlist != NULL)
- coverart_set_images (new_playlist->members);
- else
- coverart_clear_images ();
+ coverart_set_images ();
#if DEBUG_TIMING
g_get_current_time (&time);
Index: misc_confirm.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_confirm.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- misc_confirm.c 20 Feb 2007 14:11:24 -0000 1.46
+++ misc_confirm.c 27 Feb 2007 22:42:44 -0000 1.47
@@ -315,7 +315,7 @@
/* Awaken coverart selection and update the
* coverart display and ensure it is sorted correctly */
coverart_block_change (FALSE);
- coverart_set_images (dd->pl->members);
+ coverart_set_images ();
g_list_free (dd->tracks);
g_free (dd);
@@ -657,7 +657,7 @@
gtkpod_tracks_statusbar_update ();
- coverart_clear_images ();
+ coverart_set_images ();
}
Index: display_coverart.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_coverart.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- display_coverart.h 24 Feb 2007 06:24:10 -0000 1.3
+++ display_coverart.h 27 Feb 2007 22:42:44 -0000 1.4
@@ -44,7 +44,7 @@
void init_default_file (gchar *progpath);
void coverart_sort_images (GtkSortType order);
void coverart_select_cover (Itdb_Track *track);
-void coverart_set_images (GList *tracks);
+void coverart_set_images ();
void coverart_clear_images ();
void coverart_block_change ();
void coverart_init_display ();
-------------------------------------------------------------------------
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
