# HG changeset patch
# User chainsaw
# Date 1165840610 28800
# Node ID ef095eb43578618704601c5b080db26d05114678
# Parent  db3172fb53f062a6c83418d8450534566a8711f0
[svn] Add playlist_get_active where required.

diff -r db3172fb53f0 -r ef095eb43578 ChangeLog
--- a/ChangeLog	Mon Dec 11 04:34:17 2006 -0800
+++ b/ChangeLog	Mon Dec 11 04:36:50 2006 -0800
@@ -1,3 +1,11 @@
+2006-12-11 12:34:17 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [3181]
+  - update main.c to new API
+  
+  trunk/audacious/main.c |   13 ++++++++-----
+  1 file changed, 8 insertions(+), 5 deletions(-)
+
+
 2006-12-11 12:30:50 +0000  William Pitcock <nenolod@nenolod.net>
   revision [3179]
   - update these files
diff -r db3172fb53f0 -r ef095eb43578 audacious/output.c
--- a/audacious/output.c	Mon Dec 11 04:34:17 2006 -0800
+++ b/audacious/output.c	Mon Dec 11 04:36:50 2006 -0800
@@ -99,7 +99,7 @@
 	PlaylistEntry *entry;
 
 	/* don't stop yet, get the seek time and playlist position first */
-        pos = playlist_get_position();
+        pos = playlist_get_position(playlist_get_active());
         time = op->output_time();
 
 	/* reset the audio system */
@@ -113,8 +113,8 @@
             g_message("waiting for audio system shutdown...");
 
 	/* wait for the playback thread to come online */
-        playlist_set_position(pos);
-	entry = playlist_get_entry_to_play();
+        playlist_set_position(playlist_get_active(), pos);
+	entry = playlist_get_entry_to_play(playlist_get_active());
         bmp_playback_play_file(entry);
 
 	while (!bmp_playback_get_playing())
@@ -124,8 +124,8 @@
 	}
 
 	/* and signal a reseek */
-        if (playlist_get_current_length() > -1 &&
-            time <= (playlist_get_current_length()))
+        if (playlist_get_current_length(playlist_get_active()) > -1 &&
+            time <= (playlist_get_current_length(playlist_get_active())))
 	{
 	    gint i;
 
@@ -280,7 +280,7 @@
      * not requested a stop.  --nenolod
      */
     if (ip_data.stop == FALSE && 
-	(playlist_get_position_nolock() < playlist_get_length_nolock() - 1))
+	(playlist_get_position_nolock(playlist_get_active()) < playlist_get_length_nolock(playlist_get_active()) - 1))
         return;
 
     /* Sanity check. */