Merge pull request #8 from daschuer/1.12-shoutcast-fixes

Improves shoutcast by moving to _raw sending (drop syncing code from libshout) and let Mixxx do the timing.
daschuer · Oct 2, 2015 · 6412e84 · 6412e84
2 parents 1b5104f + 8bd600f
commit 6412e84
Show file tree

Hide file tree

Showing 9 changed files with 208 additions and 127 deletions.
diff --git a/res/skins/Shade/btn_broadcast_connected.png b/res/skins/Shade/btn_broadcast_connected.png
diff --git a/res/skins/Shade/btn_broadcast_connecting.png b/res/skins/Shade/btn_broadcast_connecting.png
diff --git a/res/skins/Shade/btn_broadcast_failure.png b/res/skins/Shade/btn_broadcast_failure.png
diff --git a/res/skins/Shade/btn_broadcast_unconnected.png b/res/skins/Shade/btn_broadcast_unconnected.png
diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml
@@ -612,8 +612,39 @@
 								<ConfigKey>[Master],audio_latency_usage</ConfigKey>
 							</Connection>
 						</VuMeter>
-
-
+
+					    <PushButton>
+							<Style></Style>
+							<NumberStates>4</NumberStates>
+							<State>
+								<Number>0</Number>
+								<Pressed>btn_broadcast_unconnected.png</Pressed>
+								<Unpressed>btn_broadcast_unconnected.png</Unpressed>
+							</State>
+							<State>
+								<Number>1</Number>
+								<Pressed>btn_broadcast_connecting.png</Pressed>
+								<Unpressed>btn_broadcast_connecting.png</Unpressed>
+							</State>
+							<State>
+								<Number>2</Number>
+								<Pressed>btn_broadcast_connected.png</Pressed>
+								<Unpressed>btn_broadcast_connected.png</Unpressed>
+							</State>
+							<State>
+								<Number>3</Number>
+								<Pressed>btn_broadcast_failure.png</Pressed>
+								<Unpressed>btn_broadcast_failure.png</Unpressed>
+							</State>
+							<Pos>113,30</Pos>
+							<Connection>
+								<ConfigKey>[Shoutcast],enabled</ConfigKey>
+								<ButtonState>LeftButton</ButtonState>
+							</Connection>
+							<Connection>
+								<ConfigKey>[Shoutcast],status</ConfigKey>
+							</Connection>
+						</PushButton>
 
 						<!--
 						**********************************************

diff --git a/src/engine/sidechain/enginenetworkstream.cpp b/src/engine/sidechain/enginenetworkstream.cpp
@@ -129,7 +129,7 @@ void EngineNetworkStream::writeSilence(int frames) {
     int writeAvailable = m_pOutputFifo->writeAvailable();
     int writeRequired = frames * m_numOutputChannels;
     if (writeAvailable < writeRequired) {
-        qDebug() << "EngineNetworkStream::write() buffer full";
+        qDebug() << "EngineNetworkStream::writeSilence() buffer full";
     }
     int clearCount = math_min(writeAvailable, writeRequired);
     if (clearCount > 0) {