changeset 2263:d3b950ee7e5f

Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
author William Pitcock <nenolod@atheme.org>
date Sun, 23 Dec 2007 17:51:34 -0600
parents f51a47e53d4f (diff) 05c9bec29aaa (current diff)
children 3e04aad140f9
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/pulse_audio/pulse_audio.c	Sat Dec 22 21:19:18 2007 +0100
+++ b/src/pulse_audio/pulse_audio.c	Sun Dec 23 17:51:34 2007 -0600
@@ -70,7 +70,7 @@
 
 static const char* get_song_name(void) {
     static char t[256];
-    gint session, pos;
+    gint pos;
     char *str, *u;
     Playlist *playlist = aud_playlist_get_active();
 
@@ -416,6 +416,11 @@
     pa_threaded_mainloop_lock(mainloop);
     CHECK_DEAD_GOTO(fail, 1);
 
+    /* gapless playback: new stream, reset the title. --nenolod */
+    if (time == 0) {
+        pa_stream_set_name(stream, get_song_name(), stream_success_cb, &success);
+    }
+
     if (!(o = pa_stream_flush(stream, stream_success_cb, &success))) {
         g_warning("pa_stream_flush() failed: %s", pa_strerror(pa_context_errno(context)));
         goto fail;