get format from streamer before switching output plugin

yunake · May 15, 2011 · f60708b · f60708b
1 parent d618d16
commit f60708b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/plugins.c b/plugins.c
@@ -1081,9 +1081,12 @@ plug_reinit_sound (void) {
 
     ddb_waveformat_t fmt = {0};
 
+    streamer_get_output_format (&fmt);
     if (prev) {
         state = prev->state ();
-        memcpy (&fmt, &prev->fmt, sizeof (fmt));
+        if (!fmt.channels) {
+            memcpy (&fmt, &prev->fmt, sizeof (fmt));
+        }
         prev->free ();
     }
 

diff --git a/streamer.c b/streamer.c
@@ -2049,3 +2049,8 @@ streamer_set_dsp_chain (ddb_dsp_context_t *chain) {
         streamer_set_seek (playpos);
     }
 }
+
+void
+streamer_get_output_format (ddb_waveformat_t *fmt) {
+    memcpy (fmt, &output_format, sizeof (ddb_waveformat_t));
+}
diff --git a/streamer.h b/streamer.h
@@ -19,6 +19,7 @@
 #define __STREAMER_H
 
 #include "playlist.h"
+#include "deadbeef.h"
 
 int
 streamer_init (void);
@@ -117,4 +118,7 @@ streamer_set_dsp_chain (struct ddb_dsp_context_s *chain);
 void
 streamer_dsp_refresh (void);
 
+void
+streamer_get_output_format (ddb_waveformat_t *fmt);
+
 #endif // __STREAMER_H