Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32144/src
Modified Files:
misc_confirm.c display_sorttabs.c fileselection.c prefs.h
display_playlists.c display_coverart.c details.c
Log Message:
* details.c:
removal of coverart_set_images from details_button_apply_clicked()
* display_coverart.c:
set prefs key in coverart_init_display() when coverart display is
displayed
* display_playlists.c:
added coverart_set_images to pm_add_track, pm_remove_track,
pm_track_changed.
retained coverart_set_images call in pn_selection_changed_cb as this
displays the coverart when a playlist is selected
* display_sorttabs.c:
coverart_set_images retained in st_sort() as a reiniting of the
coverart is never fired during an alphabetize operation
* fileselection.c:
calls to coverart_set_images removed as this is taken care of by
pm_add_track() in display_playlists.c
* delete_track_ok.c:
call to coverart_set_images retained as although pm_remove_track
correctly calls this function, it is too early in the delete process and the
deleted track is still displayed
* prefs.h:
addition of KEY_DISPLAY_COVERART key for use by display_playlists
functions
Index: misc_confirm.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_confirm.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- misc_confirm.c 27 Feb 2007 22:42:44 -0000 1.47
+++ misc_confirm.c 25 Mar 2007 13:18:26 -0000 1.48
@@ -312,10 +312,9 @@
gp_playlist_remove_track (dd->pl, l->data, dd->deleteaction);
}
- /* Awaken coverart selection and update the
- * coverart display and ensure it is sorted correctly */
+ /* Awaken coverart selection */
coverart_block_change (FALSE);
- coverart_set_images ();
+ coverart_set_images();
g_list_free (dd->tracks);
g_free (dd);
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- display_sorttabs.c 19 Mar 2007 14:46:08 -0000 1.90
+++ display_sorttabs.c 25 Mar 2007 13:18:26 -0000 1.91
@@ -1961,8 +1961,7 @@
for (i=0; i < prefs_get_int("sort_tab_num"); ++i)
st_sort_inst (i, order);
- Playlist *plitem = pm_get_selected_playlist ();
- coverart_set_images (plitem->members);
+ coverart_set_images ();
}
gboolean st_set_selection (Itdb_Track *track)
Index: fileselection.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/fileselection.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- fileselection.c 27 Feb 2007 22:42:44 -0000 1.15
+++ fileselection.c 25 Mar 2007 13:18:26 -0000 1.16
@@ -128,10 +128,7 @@
gtkpod_statusbar_message (_("Successfully added files"));
else
gtkpod_statusbar_message (_("Some files were not added successfully"));
-
- /* Reinitialise coverart display for selected playlist */
- coverart_set_images ();
-
+
/* Clean up the names list */
delete_file_list(names);
release_widgets ();
@@ -686,8 +683,6 @@
NULL, NULL);
prefs_set_string ("last_dir_browsed", dir);
gtkpod_tracks_statusbar_update();
- /* Reinitialise coverart display for selected playlist */
- coverart_set_images ();
}
else
{
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- prefs.h 27 Jun 2006 03:55:00 -0000 1.192
+++ prefs.h 25 Mar 2007 13:18:26 -0000 1.193
@@ -56,6 +56,7 @@
extern const gchar *KEY_PATH_SYNC_NOTES;
extern const gchar *KEY_SYNCMODE;
extern const gchar *KEY_MANUAL_SYNCDIR;
+extern const gchar *KEY_DISPLAY_COVERART;
/* New prefs backend. Will replace the stuff above */
Index: display_playlists.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_playlists.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- display_playlists.c 18 Mar 2007 14:27:18 -0000 1.99
+++ display_playlists.c 25 Mar 2007 13:18:26 -0000 1.100
@@ -1015,6 +1015,11 @@
}
}
}
+
+ if (prefs_get_int (KEY_DISPLAY_COVERART))
+ {
+ coverart_set_images ();
+ }
}
@@ -1026,6 +1031,11 @@
{
st_add_track (track, TRUE, display, 0); /* Add to first sort tab */
}
+
+ if (prefs_get_int (KEY_DISPLAY_COVERART))
+ {
+ coverart_set_images ();
+ }
}
/* Used by pm_name_changed() to find the playlist that
@@ -1068,6 +1078,11 @@
/* Check if track is member of current playlist */
if (g_list_find (current_playlist->members, track))
st_track_changed (track, FALSE, 0);
+
+ if (prefs_get_int (KEY_DISPLAY_COVERART))
+ {
+ coverart_set_images ();
+ }
}
@@ -1387,10 +1402,9 @@
/* Reallow the coverart selection update */
coverart_block_change (FALSE);
-
/* Set the coverart display based on the selected playlist */
- coverart_set_images ();
-
+ coverart_set_images();
+
space_data_update ();
#if DEBUG_TIMING
Index: display_coverart.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_coverart.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- display_coverart.c 27 Feb 2007 22:42:44 -0000 1.7
+++ display_coverart.c 25 Mar 2007 13:18:26 -0000 1.8
@@ -974,6 +974,7 @@
else
{
gtk_widget_show_all (cdwidget->contentpanel);
+ prefs_set_int (KEY_DISPLAY_COVERART, TRUE);
}
}
Index: details.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/details.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- details.c 27 Feb 2007 22:42:44 -0000 1.20
+++ details.c 25 Mar 2007 13:18:26 -0000 1.21
@@ -385,7 +385,6 @@
if (changed)
{
data_changed (detail->itdb);
- coverart_set_images ();
}
details_update_headline (detail);
-------------------------------------------------------------------------
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
