Revision: 1511
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1511&view=rev
Author: phantom_sf
Date: 2007-05-30 11:18:27 -0700 (Wed, 30 May 2007)
Log Message:
-----------
2007-05-30 P.G. Richardson <phantom_sf at users.sourceforge.net>
* display_coverart.c
Changed the on_main_cover_image_clicked so that only the
tracks belonging to the album are displayed in the track
listing. The sorttabs are no longer updated. A lot
quicker and doesnt rely on the artist/album sorttabs
being visible.
* fetchcover.c
Status bar content changes in case album is not found.
Modified Paths:
--------------
gtkpod/trunk/ChangeLog_detailed
gtkpod/trunk/src/display_coverart.c
gtkpod/trunk/src/fetchcover.c
Modified: gtkpod/trunk/ChangeLog_detailed
===================================================================
--- gtkpod/trunk/ChangeLog_detailed 2007-05-30 14:45:20 UTC (rev 1510)
+++ gtkpod/trunk/ChangeLog_detailed 2007-05-30 18:18:27 UTC (rev 1511)
@@ -1,3 +1,17 @@
+2007-05-30 P.G. Richardson <phantom_sf at users.sourceforge.net>
+
+ * display_coverart.c
+
+ Changed the on_main_cover_image_clicked so that only the
+ tracks belonging to the album are displayed in the track
+ listing. The sorttabs are no longer updated. A lot
+ quicker and doesnt rely on the artist/album sorttabs
+ being visible.
+
+ * fetchcover.c
+
+ Status bar content changes in case album is not found.
+
2007-05-30 Todd Zullinger <tmzullinger at users.sourceforge.net>
* configure.in
Modified: gtkpod/trunk/src/display_coverart.c
===================================================================
--- gtkpod/trunk/src/display_coverart.c 2007-05-30 14:45:20 UTC (rev 1510)
+++ gtkpod/trunk/src/display_coverart.c 2007-05-30 18:18:27 UTC (rev 1511)
@@ -501,7 +501,6 @@
static gint on_main_cover_image_clicked (GnomeCanvasItem *canvasitem, GdkEvent
*event, gpointer data)
{
Cover_Item *cover;
- gboolean status;
guint mbutton;
if(event->type != GDK_BUTTON_PRESS)
@@ -522,9 +521,19 @@
/* Select the correct track in the sorttabs */
album = cover->album;
- track = g_list_nth_data (album->tracks, 0);
- status = st_set_selection (track);
-
+ g_return_val_if_fail (album, FALSE);
+
+ /* Clear the tracks listed in the display */
+ tm_remove_all_tracks ();
+
+ GList *tracks = album->tracks;
+ while (tracks)
+ {
+ track = (Track *) tracks->data;
+ tm_add_track_to_track_model (track, NULL);
+ tracks = tracks->next;
+ }
+
/* Turn the display change back on */
coverart_block_change (FALSE);
}
Modified: gtkpod/trunk/src/fetchcover.c
===================================================================
--- gtkpod/trunk/src/fetchcover.c 2007-05-30 14:45:20 UTC (rev 1510)
+++ gtkpod/trunk/src/fetchcover.c 2007-05-30 18:18:27 UTC (rev 1511)
@@ -398,6 +398,8 @@
fetchcover_debug("fetchcover_next_button: getting cover for:\n- Artist:
%s\n- Album: %s",
fetchcover_track->artist, fetchcover_track->album);
+ fetchcover_statusbar_update ("");
+
if (netsearched == FALSE)
{
net_search_track ();
@@ -436,7 +438,12 @@
if (displayed_cover->image == NULL)
{
net_retrieve_image (displayed_cover->url);
- g_return_if_fail (displayed_cover->image);
+ if (displayed_cover->image == NULL)
+ {
+ gdk_window_set_cursor (window, NULL);
+ fetchcover_statusbar_update ("Failed to retrieve
image.");
+ g_return_if_fail (displayed_cover->image);
+ }
}
fetchcover_debug("Displayed Image path: %s/%s\n", displayed_cover->dir,
displayed_cover->filename);
@@ -444,7 +451,7 @@
GdkPixbuf *scaled = gdk_pixbuf_scale_simple(displayed_cover->image,
IMGSCALE, IMGSCALE, GDK_INTERP_NEAREST);
gnome_canvas_item_set(fetchcover_canvasitem, "pixbuf", scaled, NULL);
- gdk_window_set_cursor (window, gdk_cursor_new (GDK_LEFT_PTR));
+ gdk_window_set_cursor (window, NULL);
return;
}
@@ -460,6 +467,8 @@
/* decrease the index by 1 */
displayed_cover_index--;
+ fetchcover_statusbar_update ("");
+
if (displayed_cover_index <= 0)
{
/* Something went awry so make the index
@@ -484,7 +493,11 @@
if (displayed_cover->image == NULL)
{
net_retrieve_image (displayed_cover->url);
- g_return_if_fail (displayed_cover->image);
+ if (displayed_cover->image == NULL)
+ {
+ fetchcover_statusbar_update ("Failed to retrieve
image.");
+ g_return_if_fail (displayed_cover->image);
+ }
}
GdkPixbuf *scaled = gdk_pixbuf_scale_simple(displayed_cover->image,
IMGSCALE, IMGSCALE, GDK_INTERP_NEAREST);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
