Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5387/src
Modified Files:
Tag: coverart_display_development_branch
display_coverart.c display_sorttabs.c display_coverart.h
Log Message:
display_coverart.c
- search_tracks_by_album() removed as unnecessary and fails if albums
have the same name yet by different artists.
- clicking button changes the value of the slider which then changes
the coverart. Added bonus that this syncs the value of the slider when a button
is clicked.
display_sorttabs.c
- changed to pass the track to coverart_select_cover() rather than just
album
Index: display_coverart.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/Attic/display_coverart.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- display_coverart.c 12 Feb 2007 23:06:09 -0000 1.1.2.6
+++ display_coverart.c 14 Feb 2007 21:31:40 -0000 1.1.2.7
@@ -45,7 +45,6 @@
static void raise_cdimages (GPtrArray *cdcovers);
static GdkPixbuf *get_thumb (Itdb_Track *track);
static void scroll_covers (gint direction);
-static gint search_tracks_by_album (Itdb_Track *a, gchar *b);
static void on_cover_display_button_clicked (GtkWidget *widget, gpointer data);
static void on_main_cover_image_clicked (GnomeCanvas *canvas, GdkEvent *event,
gpointer data);
static void on_cover_display_slider_value_changed (GtkRange *range, gpointer
user_data);
@@ -277,7 +276,7 @@
"fill_color", "white",
"justification", GTK_JUSTIFY_CENTER,
NULL);
- }
+ }
}
}
@@ -340,6 +339,9 @@
{
gint index, displaytotal;
+ if (cdwidget->block_display_change)
+ return;
+
index = gtk_range_get_value (range);
displaytotal = g_list_length(cdwidget->displaytracks);
@@ -376,11 +378,16 @@
label = gtk_button_get_label(button);
if(g_str_equal(label, (gchar *) ">"))
- scroll_covers (IMG_NEXT);
+ //scroll_covers (IMG_NEXT);
+ cdwidget->first_imgindex++;
else
- scroll_covers (IMG_PREV);
+ //scroll_covers (IMG_PREV);
+ cdwidget->first_imgindex--;
- /* debug_albums(); */
+ /* Change the value of the slider to do the work of scrolling the
covers */
+ gtk_range_set_value (GTK_RANGE (cdwidget->cdslider),
(cdwidget->first_imgindex + IMG_MAIN + 1));
+
+ /* debug_albums(); */
}
/**
@@ -666,31 +673,6 @@
}
/**
- * search_tracks_by_album:
- *
- * find function used by glist_find_custom to compare 2
- * tracks
- *
- * @a: Track from list to compare against
- * @b: Album string to compare with
- *
- * Returns:
- * 0 if the two tracks match
- * -1 if the two tracks are different
- *
- */
-static gint search_tracks_by_album (Itdb_Track *a, gchar *b)
-{
- if(a == NULL)
- return -1;
-
- if (g_ascii_strcasecmp (a->album, b) == 0)
- return 0;
-
- return -1;
-}
-
-/**
* init_default_file:
*
* Initialises the image file used if an album has no cover. This
@@ -866,7 +848,7 @@
* @track: chosen album
*
*/
-void coverart_select_cover (gchar *album)
+void coverart_select_cover (Itdb_Track *track)
{
GList *selectedtrk;
gint displaytotal, index;
@@ -880,7 +862,7 @@
return;
/* Find the track that matches the given album */
- selectedtrk = g_list_find_custom (cdwidget->displaytracks, album,
(GCompareFunc) search_tracks_by_album);
+ selectedtrk = g_list_find_custom (cdwidget->displaytracks, track,
(GCompareFunc) search_tracks);
g_return_if_fail (selectedtrk);
/* Determine the index of the found track */
@@ -909,10 +891,7 @@
*
*/
void coverart_sort_images (GtkSortType order)
-{
- Playlist* pl;
- GList *newlist = NULL;
-
+{
/*if (order == SORT_NONE)
{
//pl = pm_get_selected_playlist ();
@@ -971,7 +950,6 @@
coverart_clear_images ();
cdwidget->first_imgindex = 0;
cdwidget->displaytracks = NULL;
- gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), 0);
if (tracks == NULL)
return;
@@ -1002,6 +980,8 @@
/* Set the scale range */
gtk_range_set_range (GTK_RANGE (cdwidget->cdslider), 0, g_list_length
(cdwidget->displaytracks) - 1);
+ gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), 0);
+
/*printf("######### ORIGINAL LINE UP ########\n");
debug_albums ();
printf("######### END OF ORIGINAL LINE UP #######\n");*/
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.85.2.5
retrieving revision 1.85.2.6
diff -u -d -r1.85.2.5 -r1.85.2.6
--- display_sorttabs.c 12 Feb 2007 23:06:10 -0000 1.85.2.5
+++ display_sorttabs.c 14 Feb 2007 21:31:40 -0000 1.85.2.6
@@ -2212,7 +2212,7 @@
{
Track *track = gl->data;
if (track != NULL)
- coverart_select_cover (track->album);
+ coverart_select_cover (track);
}
}
Index: display_coverart.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/Attic/display_coverart.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- display_coverart.h 12 Feb 2007 23:06:10 -0000 1.1.2.6
+++ display_coverart.h 14 Feb 2007 21:31:40 -0000 1.1.2.7
@@ -37,7 +37,7 @@
void init_default_file (gchar *progpath);
void coverart_sort_images (GtkSortType order);
-void coverart_select_cover (gchar *album);
+void coverart_select_cover (Itdb_Track *track);
void coverart_set_images (GList *tracks);
void coverart_clear_images ();
void coverart_block_change ();
-------------------------------------------------------------------------
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
