# HG changeset patch
# User nenolod
# Date 1165843184 28800
# Node ID 958855dae693cf6c292988545b58781ea67b4c04
# Parent  f7a8c1280ef6f482f8df9b2c601b8613d78d2e0b
[svn] - fix other plugins dependant on the playlist framework

diff -r f7a8c1280ef6 -r 958855dae693 ChangeLog
--- a/ChangeLog	Mon Dec 11 05:15:01 2006 -0800
+++ b/ChangeLog	Mon Dec 11 05:19:44 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-11 13:15:01 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [792]
+  - nevermind, m3u did need an update.
+  
+  trunk/src/m3u/m3u.c |    3 ++-
+  1 file changed, 2 insertions(+), 1 deletion(-)
+
+
 2006-12-11 13:13:54 +0000  William Pitcock <nenolod@nenolod.net>
   revision [790]
   - update playlist code. M3U was simple and did not require anything special.
diff -r f7a8c1280ef6 -r 958855dae693 src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Mon Dec 11 05:15:01 2006 -0800
+++ b/src/console/Audacious_Driver.cxx	Mon Dec 11 05:19:44 2006 -0800
@@ -419,7 +419,7 @@
 					gchar _buf[path_max];
 					g_snprintf(_buf, path_max, "%s?%d", fh.path, i);
 
-					playlist_add_url(_buf);
+					playlist_add_url(playlist_get_active(), _buf);
 				}
 				result = -1;
 			}
diff -r f7a8c1280ef6 -r 958855dae693 src/cue/cuesheet.c
--- a/src/cue/cuesheet.c	Mon Dec 11 05:15:01 2006 -0800
+++ b/src/cue/cuesheet.c	Mon Dec 11 05:19:44 2006 -0800
@@ -121,7 +121,7 @@
 			gchar _buf[65535];
 
 			g_snprintf(_buf, 65535, "cue://%s?%d", filename, i);
-			playlist_add_url(_buf);
+			playlist_add_url(playlist_get_active(), _buf);
 		}
 
 		free_cue_info();
@@ -272,15 +272,18 @@
 static void set_info_override(gchar * unused, gint length, gint rate, gint freq, gint nch)
 {
 	gchar *title;
+	Playlist *playlist = playlist_get_active();
+
+	g_return_if_fail(playlist != NULL);
 
 	/* annoying. */
-	if (playlist_position->tuple == NULL)
+	if (playlist->position->tuple == NULL)
 	{
-		gint pos = playlist_get_position();
-		playlist_get_tuple(pos);
+		gint pos = playlist_get_position(playlist);
+		playlist_get_tuple(playlist, pos);
 	}
 
-	title = g_strdup(playlist_position->title);
+	title = g_strdup(playlist->position->title);
 
 	cue_ip.set_info(title, length, rate, freq, nch);
 }
@@ -353,6 +356,7 @@
 {
 	gint time = get_output_time();
 	gboolean dir = FALSE;
+	Playlist *playlist = playlist_get_active();
 
 	if (time == -1)
 		time = G_MAXINT;
@@ -362,7 +366,7 @@
 		cur_cue_track--;
 		if (!(time < cue_tracks[cur_cue_track].index))
 			finetune_seek = time;
-		playlist_prev();
+		playlist_prev(playlist);
 		dir = TRUE;
 		time = get_output_time();
 		g_usleep(10000);
@@ -377,7 +381,7 @@
 			stop();
 			return TRUE;
 		}
-		playlist_next();
+		playlist_next(playlist);
 		time = get_output_time();
 		g_usleep(10000);
 	}
diff -r f7a8c1280ef6 -r 958855dae693 src/scrobbler/plugin.c
--- a/src/scrobbler/plugin.c	Mon Dec 11 05:15:01 2006 -0800
+++ b/src/scrobbler/plugin.c	Mon Dec 11 05:19:44 2006 -0800
@@ -477,7 +477,7 @@
 
 			pdebug("Submitting song.", DEBUG);
 
-			tuple = playlist_get_tuple(dosubmit.pos_c);
+			tuple = playlist_get_tuple(playlist_get_active(), dosubmit.pos_c);
 
 			if (ishttp(tuple->file_name))
 				continue;