Mercurial > audlegacy

changeset 2087:bc47a2129067 trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - update these files
author nenolod
date Mon, 11 Dec 2006 04:30:50 -0800
parents c547fe73f290
children db3172fb53f0
files ChangeLog audacious/genevent.c audacious/util.c
diffstat 3 files changed, 20 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Dec 11 04:28:00 2006 -0800
+++ b/ChangeLog	Mon Dec 11 04:30:50 2006 -0800
@@ -1,3 +1,12 @@
+2006-12-11 12:28:00 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3177]
+  - update widgetcore to new API
+  
+  trunk/audacious/widgets/playlist_list.c   |   42 ++++++++++++++++--------------
+  trunk/audacious/widgets/playlist_slider.c |    8 +++--
+  2 files changed, 28 insertions(+), 22 deletions(-)
+
+
 2006-12-11 12:19:56 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3175]
   - finish conversion to new API.
--- a/audacious/genevent.c	Mon Dec 11 04:28:00 2006 -0800
+++ b/audacious/genevent.c	Mon Dec 11 04:30:50 2006 -0800
@@ -110,10 +110,12 @@
     }
 
     if (!cfg.pause_between_songs ||
-        g_timer_elapsed(pause_timer, NULL) >= cfg.pause_between_songs_time) {
+        g_timer_elapsed(pause_timer, NULL) >= cfg.pause_between_songs_time)
+    {
+	Playlist *playlist = playlist_get_active();
 
         GDK_THREADS_ENTER();
-        playlist_eof_reached();
+        playlist_eof_reached(playlist);
         GDK_THREADS_LEAVE();
 
         waiting = FALSE;
--- a/audacious/util.c	Mon Dec 11 04:28:00 2006 -0800
+++ b/audacious/util.c	Mon Dec 11 04:30:50 2006 -0800
@@ -777,6 +777,7 @@
     GSList *cur;
     gchar *ptr;
     guint ctr = 0;
+    Playlist *playlist = playlist_get_active();
 
     if (GTK_IS_WIDGET(mainwin_jtf))
         gtk_widget_set_sensitive(mainwin_jtf, FALSE);
@@ -784,9 +785,9 @@
     for (cur = files; cur; cur = g_slist_next(cur)) {
 
         if (g_file_test(cur->data,G_FILE_TEST_IS_DIR)) {
-            playlist_add_dir((const gchar *) cur->data);
+            playlist_add_dir(playlist, (const gchar *) cur->data);
         } else {
-            playlist_add((const gchar *) cur->data);
+            playlist_add(playlist, (const gchar *) cur->data);
         }       
 
         if (++ctr == 20) {
@@ -832,7 +833,7 @@
 
     if (!files) return;
 
-    playlist_clear();
+    playlist_clear(playlist_get_active());
 
     filebrowser_add_files(browser, files);
     g_slist_foreach(files, (GFunc) g_free, NULL);
@@ -1111,12 +1112,13 @@
 {
     int ctr = 0;
     char *ptr;
+    Playlist *playlist = playlist_get_active();
 
     if (GTK_IS_WIDGET(mainwin_jtf))
 	gtk_widget_set_sensitive(mainwin_jtf, FALSE);
 
     while (files[ctr] != NULL) {
-	playlist_add(files[ctr++]);
+	playlist_add(playlist, files[ctr++]);
     }
     playlistwin_update_list();
 
@@ -1148,7 +1150,7 @@
     if (util_filebrowser_is_dir_classic
 	(GTK_FILE_SELECTION(GTK_FILE_SELECTION(filesel))))
 	return;
-    playlist_clear();
+    playlist_clear(playlist_get_active());
     files = gtk_file_selection_get_selections(GTK_FILE_SELECTION(filesel));
     filebrowser_add_files_classic(files, GTK_FILE_SELECTION(filesel));
     gtk_widget_destroy(filesel);