Add option to convert 16 bit audio to 24 bit

Conflicts:

	plugins/gtkui/callbacks.h
	streamer.c

1 files changed, 13 insertions, 0 deletions

diff --git a/streamer.c b/streamer.c
index 50ab9bfc..fe655d07 100644
--- a/streamer.c
+++ b/streamer.c
@@ -80,6 +80,8 @@ static int dsp_on = 0;
 
 static int autoconv_8_to_16 = 1;
 
+static int autoconv_16_to_24 = 0;
+
 static int streaming_terminate;
 
 // buffer up to 3 seconds at 44100Hz stereo
@@ -1976,6 +1978,11 @@ streamer_set_output_format (void) {
             fmt.bps = 16;
         }
     }
+    if (autoconv_16_to_24) {
+        if (fmt.bps == 16) {
+            fmt.bps = 24;
+        }
+    }
     output->setformat (&fmt);
     streamer_buffering = 1;
     if (playing && output->state () != OUTPUT_STATE_PLAYING) {
@@ -2371,6 +2378,12 @@ streamer_configchanged (void) {
         formatchanged = 1;
         streamer_reset (1);
     }
+    int conf_autoconv_16_to_24 = conf_get_int ("streamer.16_to_24",0);
+    if (conf_autoconv_16_to_24 != autoconv_16_to_24) {
+        autoconv_16_to_24 = conf_autoconv_16_to_24;
+        formatchanged = 1;
+        streamer_reset (1);
+    }
 
     char mapstr[2048];
     deadbeef->conf_get_str ("network.ctmapping", DDB_DEFAULT_CTMAPPING, mapstr, sizeof (mapstr));