changeset 1021:da9d6ad2b5b5 trunk

[svn] - fix pulse_audio output sink. reported by Chainsaw.
author nenolod
date Fri, 11 May 2007 17:16:13 -0700
parents fe9ffc829b5f
children e3beb4b76591
files ChangeLog src/pulse_audio/pulse_audio.c
diffstat 2 files changed, 16 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 11 17:01:10 2007 -0700
+++ b/ChangeLog	Fri May 11 17:16:13 2007 -0700
@@ -1,3 +1,13 @@
+2007-05-12 00:01:10 +0000  Giacomo Lozito <james@develia.org>
+  revision [2204]
+  - amidi-plug works again (uses auddrct.h in place of the deprecated beepctrl.h)
+  trunk/src/amidi-plug/amidi-plug.c  |    4 ++--
+  trunk/src/amidi-plug/amidi-plug.h  |    2 +-
+  trunk/src/amidi-plug/i_common.h    |    2 +-
+  trunk/src/amidi-plug/i_configure.c |    4 ++--
+  4 files changed, 6 insertions(+), 6 deletions(-)
+
+
 2007-05-11 22:45:20 +0000  Giacomo Lozito <james@develia.org>
   revision [2202]
   - aosd: remove aosd_osd_check_composite_mgr from where it was not supposed to be
--- a/src/pulse_audio/pulse_audio.c	Fri May 11 17:01:10 2007 -0700
+++ b/src/pulse_audio/pulse_audio.c	Fri May 11 17:16:13 2007 -0700
@@ -29,9 +29,9 @@
 #include <limits.h>
 
 #include <gtk/gtk.h>
-#include "audacious/plugin.h"
-#include "audacious/beepctrl.h"
-#include "audacious/util.h"
+#include <audacious/plugin.h>
+#include <audacious/playlist.h>
+#include <audacious/util.h>
 
 #include <pulse/pulseaudio.h>
 
@@ -73,10 +73,10 @@
     static char t[256];
     gint session, pos;
     char *str, *u;
+    Playlist *playlist = playlist_get_active();
 
-    session = ctrlsocket_get_session_id();
-    pos = xmms_remote_get_playlist_pos(session);
-    if (!(str = xmms_remote_get_playlist_title(session, pos)))
+    pos = playlist_get_position(playlist);
+    if (!(str = playlist_get_title(playlist, pos)))
         return "Playback Stream";
 
     snprintf(t, sizeof(t), "%s", u = pa_locale_to_utf8(str));