ActiveAE: flush engine on flush stream if only one stream is active

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
index 4326729..30af6e8 100644 (file)
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp
@@ -1077,6 +1077,33 @@ void CActiveAE::SFlushStream(CActiveAEStream *stream)
   stream->m_streamPort->Purge();
   stream->m_bufferedTime = 0.0;
   stream->m_paused = true;
+
+  // flsuh the engine if we only have a single stream
+  if (m_streams.size() == 1)
+  {
+    m_sinkBuffers->Flush();
+    m_vizBuffers->Flush();
+
+    // send message to sink
+    Message *reply;
+    if (m_sink.m_controlPort.SendOutMessageSync(CSinkControlProtocol::FLUSH, 
+                                             &reply, 2000))
+    {
+      bool success = reply->signal == CSinkControlProtocol::ACC ? true : false;
+      if (!success)
+      {
+        CLog::Log(LOGERROR, "ActiveAE::%s - returned error on flush", __FUNCTION__);
+        m_extError = true;
+      }
+      reply->Release();
+    }
+    else
+    {
+      CLog::Log(LOGERROR, "ActiveAE::%s - failed to flush", __FUNCTION__);
+      m_extError = true;
+    }
+    m_stats.Reset(m_sinkFormat.m_sampleRate);
+  }
 }
 
 void CActiveAE::ClearDiscardedBuffers()

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
index 82854c2..4785c76 100644 (file)
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
@@ -167,6 +167,11 @@ void CActiveAESink::StateMachine(int signal, Protocol *port, Message *msg)
           msg->Reply(CSinkControlProtocol::ACC);
           return;
 
+        case CSinkControlProtocol::FLUSH:
+          ReturnBuffers();
+          msg->Reply(CSinkControlProtocol::ACC);
+          return;
+
         default:
           break;
         }

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h
index 559179c..e241b03 100644 (file)
--- a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h
+++ b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h
@@ -50,6 +50,7 @@ public:
     UNCONFIGURE,
     SILENCEMODE,
     VOLUME,
+    FLUSH,
     TIMEOUT,
   };
   enum InSignal