[AE] dvdplayer: drop vis callbacks

4 files changed, 0 insertions, 32 deletions

diff --git a/xbmc/cores/dvdplayer/DVDAudio.cpp b/xbmc/cores/dvdplayer/DVDAudio.cpp
index 65068a5a53..ac26fa7aca 100644
--- a/xbmc/cores/dvdplayer/DVDAudio.cpp
+++ b/xbmc/cores/dvdplayer/DVDAudio.cpp
@@ -35,7 +35,6 @@ CDVDAudio::CDVDAudio(volatile bool &bStop)
   : m_bStop(bStop)
 {
   m_pAudioDecoder = NULL;
-  m_pCallback = NULL;
   m_iBufferSize = 0;
   m_dwPacketSize = 0;
   m_pBuffer = NULL;
@@ -58,19 +57,6 @@ CDVDAudio::~CDVDAudio()
   free(m_pBuffer);
 }
 
-void CDVDAudio::RegisterAudioCallback(IAudioCallback* pCallback)
-{
-  CSingleLock lock (m_critSection);
-  m_pCallback = pCallback;
-  if (m_pCallback && m_pAudioDecoder && !m_bPassthrough)
-    m_pCallback->OnInitialize(m_iChannels, m_iBitrate, m_iBitsPerSample);
-}
-
-void CDVDAudio::UnRegisterAudioCallback()
-{
-  CSingleLock lock (m_critSection);
-  m_pCallback = NULL;
-}
 
 bool CDVDAudio::Create(const DVDAudioFrame &audioframe, CodecID codec)
 {
@@ -117,10 +103,6 @@ bool CDVDAudio::Create(const DVDAudioFrame &audioframe, CodecID codec)
     m_pAudioDecoder->Pause();
 
   m_iBufferSize = 0;
-
-  if(m_pCallback && !m_bPassthrough)
-    m_pCallback->OnInitialize(m_iChannels, m_iBitrate, m_iBitsPerSample);
-
   SetDynamicRangeCompression((long)(g_settings.m_currentVideoSettings.m_VolumeAmplification * 100));
 
   return true;
@@ -197,10 +179,6 @@ DWORD CDVDAudio::AddPackets(const DVDAudioFrame &audioframe)
   DWORD total = len;
   DWORD copied;
 
-  //Feed audio to the visualizer if necessary.
-  if(m_pCallback && !m_bPassthrough)
-    m_pCallback->OnAudioData(data, len);
-
   // When paused, we need to buffer all data as renderers don't need to accept it
   if (m_bPaused)
   {
diff --git a/xbmc/cores/dvdplayer/DVDAudio.h b/xbmc/cores/dvdplayer/DVDAudio.h
index d03b4ab780..8a51be7580 100644
--- a/xbmc/cores/dvdplayer/DVDAudio.h
+++ b/xbmc/cores/dvdplayer/DVDAudio.h
@@ -25,7 +25,6 @@
   #include "config.h"
 #endif
 #include "cores/AudioRenderers/IAudioRenderer.h"
-#include "cores/IAudioCallback.h"
 #include "threads/CriticalSection.h"
 #include "PlatformDefs.h"
 
@@ -54,9 +53,6 @@ public:
   CDVDAudio(volatile bool& bStop);
   ~CDVDAudio();
 
-  void RegisterAudioCallback(IAudioCallback* pCallback);
-  void UnRegisterAudioCallback();
-
   void SetVolume(float fVolume);
   void SetDynamicRangeCompression(long drc);
   float GetCurrentAttenuation();
@@ -77,7 +73,6 @@ public:
   IAudioRenderer* m_pAudioDecoder;
 protected:
   DWORD AddPacketsRenderer(unsigned char* data, DWORD len, CSingleLock &lock);
-  IAudioCallback* m_pCallback;
   BYTE* m_pBuffer; // should be [m_dwPacketSize]
   DWORD m_iBufferSize;
   DWORD m_dwPacketSize;
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h
index da04bd7d74..c5afa70ecf 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.h
+++ b/xbmc/cores/dvdplayer/DVDPlayer.h
@@ -167,8 +167,6 @@ class CDVDPlayer : public IPlayer, public CThread, public IDVDPlayer
 public:
   CDVDPlayer(IPlayerCallback& callback);
   virtual ~CDVDPlayer();
-  virtual void RegisterAudioCallback(IAudioCallback* pCallback) { m_dvdPlayerAudio.RegisterAudioCallback(pCallback); }
-  virtual void UnRegisterAudioCallback()                        { m_dvdPlayerAudio.UnRegisterAudioCallback(); }
   virtual bool OpenFile(const CFileItem& file, const CPlayerOptions &options);
   virtual bool CloseFile();
   virtual bool IsPlaying() const;
diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.h b/xbmc/cores/dvdplayer/DVDPlayerAudio.h
index ea1b59a439..43ffdde608 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerAudio.h
+++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.h
@@ -93,9 +93,6 @@ public:
   CDVDPlayerAudio(CDVDClock* pClock, CDVDMessageQueue& parent);
   virtual ~CDVDPlayerAudio();
 
-  void RegisterAudioCallback(IAudioCallback* pCallback) { m_dvdAudio.RegisterAudioCallback(pCallback); }
-  void UnRegisterAudioCallback()                        { m_dvdAudio.UnRegisterAudioCallback(); }
-
   bool OpenStream(CDVDStreamInfo &hints);
   void OpenStream(CDVDStreamInfo &hints, CDVDAudioCodec* codec);
   void CloseStream(bool bWaitForBuffers);