Merge pull request #13169 from FernetMenta/nullsink

AE: drop null sink
xbmc · Dec 11, 2017 · 66747ba · 66747ba
2 parents 014d7f6 + 2226b46
commit 66747ba
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 228 deletions.
diff --git a/xbmc/cores/AudioEngine/CMakeLists.txt b/xbmc/cores/AudioEngine/CMakeLists.txt
@@ -20,8 +20,7 @@ set(SOURCES AEResampleFactory.cpp
             Utils/AELimiter.cpp
             Utils/AEPackIEC61937.cpp
             Utils/AEStreamInfo.cpp
-            Utils/AEUtil.cpp
-            Sinks/AESinkNULL.cpp)
+            Utils/AEUtil.cpp)
 
 set(HEADERS AEResampleFactory.h
             AESinkFactory.h
@@ -47,7 +46,6 @@ set(HEADERS AEResampleFactory.h
             Interfaces/AEStream.h
             Interfaces/IAudioCallback.h
             Interfaces/ThreadedAE.h
-            Sinks/AESinkNULL.h
             Utils/AEAudioFormat.h
             Utils/AEBitstreamPacker.h
             Utils/AEChannelData.h

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp
@@ -836,16 +836,6 @@ void CActiveAESink::OpenSink()
     m_sink = CAESinkFactory::Create(device, m_sinkFormat);
   }
 
-  // open NULL sink
-  //! @todo should not be required by ActiveAE
-  if (!m_sink)
-  {
-    device = "NULL:NULL";
-    m_sinkFormat = m_requestedFormat;
-    CLog::Log(LOGDEBUG, "CActiveAESink::OpenSink - open NULL sink");
-    m_sink = CAESinkFactory::Create(device, m_sinkFormat);
-  }
-
   if (!m_sink)
   {
     CLog::Log(LOGERROR, "CActiveAESink::OpenSink - no sink was returned");

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkNULL.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkNULL.cpp
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkNULL.h b/xbmc/cores/AudioEngine/Sinks/AESinkNULL.h