aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xbmc/ApplicationPlayer.cpp14
-rw-r--r--xbmc/ApplicationPlayer.h3
-rw-r--r--xbmc/addons/Visualisation.cpp2
-rw-r--r--xbmc/cores/DummyVideoPlayer.h2
-rw-r--r--xbmc/cores/ExternalPlayer/ExternalPlayer.h2
-rw-r--r--xbmc/cores/IPlayer.h2
-rw-r--r--xbmc/cores/dvdplayer/DVDAudio.cpp20
-rw-r--r--xbmc/cores/dvdplayer/DVDAudio.h5
-rw-r--r--xbmc/cores/dvdplayer/DVDPlayer.h2
-rw-r--r--xbmc/cores/dvdplayer/DVDPlayerAudio.h4
-rw-r--r--xbmc/cores/dvdplayer/IDVDPlayer.h3
-rw-r--r--xbmc/cores/omxplayer/OMXAudio.cpp20
-rw-r--r--xbmc/cores/omxplayer/OMXAudio.h4
-rw-r--r--xbmc/cores/omxplayer/OMXPlayerAudio.h2
14 files changed, 0 insertions, 85 deletions
diff --git a/xbmc/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp
index ca874806b4..a2522d2a3c 100644
--- a/xbmc/ApplicationPlayer.cpp
+++ b/xbmc/ApplicationPlayer.cpp
@@ -116,20 +116,6 @@ bool CApplicationPlayer::HasPlayer() const
return player != NULL;
}
-void CApplicationPlayer::RegisterAudioCallback(IAudioCallback* pCallback)
-{
- boost::shared_ptr<IPlayer> player = GetInternal();
- if (player)
- player->RegisterAudioCallback(pCallback);
-}
-
-void CApplicationPlayer::UnRegisterAudioCallback()
-{
- boost::shared_ptr<IPlayer> player = GetInternal();
- if (player)
- player->UnRegisterAudioCallback();
-}
-
int CApplicationPlayer::GetChapter()
{
boost::shared_ptr<IPlayer> player = GetInternal();
diff --git a/xbmc/ApplicationPlayer.h b/xbmc/ApplicationPlayer.h
index 964570c251..8abcd46ec7 100644
--- a/xbmc/ApplicationPlayer.h
+++ b/xbmc/ApplicationPlayer.h
@@ -37,7 +37,6 @@ namespace PVR
class CPVRChannel;
}
-class IAudioCallback;
class CAction;
class CPlayerOptions;
class CStreamDetails;
@@ -133,7 +132,6 @@ public:
void Pause();
bool QueueNextFile(const CFileItem &file);
bool Record(bool bOnOff);
- void RegisterAudioCallback(IAudioCallback* pCallback);
void Seek(bool bPlus = true, bool bLargeStep = false, bool bChapterOverride = false);
int SeekChapter(int iChapter);
void SeekPercentage(float fPercent = 0);
@@ -150,5 +148,4 @@ public:
void SetVolume(float volume);
bool SwitchChannel(const PVR::CPVRChannel &channel);
void ToFFRW(int iSpeed = 0);
- void UnRegisterAudioCallback();
};
diff --git a/xbmc/addons/Visualisation.cpp b/xbmc/addons/Visualisation.cpp
index 9412963a78..810e5b2ff2 100644
--- a/xbmc/addons/Visualisation.cpp
+++ b/xbmc/addons/Visualisation.cpp
@@ -109,7 +109,6 @@ bool CVisualisation::Create(int x, int y, int w, int h, void *device)
CreateBuffers();
- g_application.m_pPlayer->RegisterAudioCallback(this);
CAEFactory::RegisterAudioCallback(this);
return true;
@@ -174,7 +173,6 @@ void CVisualisation::Render()
void CVisualisation::Stop()
{
- g_application.m_pPlayer->UnRegisterAudioCallback();
CAEFactory::UnregisterAudioCallback();
if (Initialized())
{
diff --git a/xbmc/cores/DummyVideoPlayer.h b/xbmc/cores/DummyVideoPlayer.h
index 85cb90edab..5bc12fd617 100644
--- a/xbmc/cores/DummyVideoPlayer.h
+++ b/xbmc/cores/DummyVideoPlayer.h
@@ -28,8 +28,6 @@ class CDummyVideoPlayer : public IPlayer, public CThread
public:
CDummyVideoPlayer(IPlayerCallback& callback);
virtual ~CDummyVideoPlayer();
- virtual void RegisterAudioCallback(IAudioCallback* pCallback) {}
- virtual void UnRegisterAudioCallback() {}
virtual bool OpenFile(const CFileItem& file, const CPlayerOptions &options);
virtual bool CloseFile();
virtual bool IsPlaying() const;
diff --git a/xbmc/cores/ExternalPlayer/ExternalPlayer.h b/xbmc/cores/ExternalPlayer/ExternalPlayer.h
index 66f1cbfa56..06ebf92c44 100644
--- a/xbmc/cores/ExternalPlayer/ExternalPlayer.h
+++ b/xbmc/cores/ExternalPlayer/ExternalPlayer.h
@@ -35,8 +35,6 @@ public:
CExternalPlayer(IPlayerCallback& callback);
virtual ~CExternalPlayer();
virtual bool Initialize(TiXmlElement* pConfig);
- virtual void RegisterAudioCallback(IAudioCallback* pCallback) {}
- virtual void UnRegisterAudioCallback() {}
virtual bool OpenFile(const CFileItem& file, const CPlayerOptions &options);
virtual bool CloseFile(bool reopen = false);
virtual bool IsPlaying() const;
diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h
index efb5595b09..a72c219c22 100644
--- a/xbmc/cores/IPlayer.h
+++ b/xbmc/cores/IPlayer.h
@@ -128,8 +128,6 @@ public:
IPlayer(IPlayerCallback& callback): m_callback(callback){};
virtual ~IPlayer(){};
virtual bool Initialize(TiXmlElement* pConfig) { return true; };
- virtual void RegisterAudioCallback(IAudioCallback* pCallback) {};
- virtual void UnRegisterAudioCallback() {};
virtual bool OpenFile(const CFileItem& file, const CPlayerOptions& options){ return false;}
virtual bool QueueNextFile(const CFileItem &file) { return false; }
virtual void OnNothingToQueueNotify() {}
diff --git a/xbmc/cores/dvdplayer/DVDAudio.cpp b/xbmc/cores/dvdplayer/DVDAudio.cpp
index 46e9509b6b..6514030357 100644
--- a/xbmc/cores/dvdplayer/DVDAudio.cpp
+++ b/xbmc/cores/dvdplayer/DVDAudio.cpp
@@ -95,7 +95,6 @@ CDVDAudio::CDVDAudio(volatile bool &bStop)
: m_bStop(bStop)
{
m_pAudioStream = NULL;
- m_pAudioCallback = NULL;
m_bPassthrough = false;
m_iBitsPerSample = 0;
m_iBitrate = 0;
@@ -146,9 +145,6 @@ bool CDVDAudio::Create(const DVDAudioFrame &audioframe, AVCodecID codec, bool ne
SetDynamicRangeCompression((long)(CMediaSettings::Get().GetCurrentVideoSettings().m_VolumeAmplification * 100));
- if (m_pAudioCallback)
- RegisterAudioCallback(m_pAudioCallback);
-
return true;
}
@@ -225,22 +221,6 @@ void CDVDAudio::Drain()
m_pAudioStream->Drain(true);
}
-void CDVDAudio::RegisterAudioCallback(IAudioCallback* pCallback)
-{
- CSingleLock lock (m_critSection);
- m_pAudioCallback = pCallback;
- if (m_pAudioStream)
- m_pAudioStream->RegisterAudioCallback(pCallback);
-}
-
-void CDVDAudio::UnRegisterAudioCallback()
-{
- CSingleLock lock (m_critSection);
- if (m_pAudioStream)
- m_pAudioStream->UnRegisterAudioCallback();
- m_pAudioCallback = NULL;
-}
-
void CDVDAudio::SetVolume(float volume)
{
CSingleLock lock (m_critSection);
diff --git a/xbmc/cores/dvdplayer/DVDAudio.h b/xbmc/cores/dvdplayer/DVDAudio.h
index 54c34e5d93..629fb3237e 100644
--- a/xbmc/cores/dvdplayer/DVDAudio.h
+++ b/xbmc/cores/dvdplayer/DVDAudio.h
@@ -52,7 +52,6 @@ public:
};
class CSingleLock;
-class IAudioCallback;
class CDVDAudio
{
@@ -60,9 +59,6 @@ public:
CDVDAudio(volatile bool& bStop);
~CDVDAudio();
- void RegisterAudioCallback(IAudioCallback* pCallback);
- void UnRegisterAudioCallback();
-
void SetVolume(float fVolume);
void SetDynamicRangeCompression(long drc);
float GetCurrentAttenuation();
@@ -97,7 +93,6 @@ protected:
bool m_bPaused;
volatile bool& m_bStop;
- IAudioCallback* m_pAudioCallback; //the viz audio callback
//counter that will go from 0 to m_iSpeed-1 and reset, data will only be output when speedstep is 0
//int m_iSpeedStep;
};
diff --git a/xbmc/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h
index 2b04da86c4..951382c2f7 100644
--- a/xbmc/cores/dvdplayer/DVDPlayer.h
+++ b/xbmc/cores/dvdplayer/DVDPlayer.h
@@ -217,8 +217,6 @@ public:
virtual float GetPercentage();
virtual float GetCachePercentage();
- virtual void RegisterAudioCallback(IAudioCallback* pCallback) { m_dvdPlayerAudio->RegisterAudioCallback(pCallback); }
- virtual void UnRegisterAudioCallback() { m_dvdPlayerAudio->UnRegisterAudioCallback(); }
virtual void SetVolume(float nVolume) { m_dvdPlayerAudio->SetVolume(nVolume); }
virtual void SetMute(bool bOnOff) { m_dvdPlayerAudio->SetMute(bOnOff); }
virtual void SetDynamicRangeCompression(long drc) { m_dvdPlayerAudio->SetDynamicRangeCompression(drc); }
diff --git a/xbmc/cores/dvdplayer/DVDPlayerAudio.h b/xbmc/cores/dvdplayer/DVDPlayerAudio.h
index 40f6446c9d..e8b2ab6086 100644
--- a/xbmc/cores/dvdplayer/DVDPlayerAudio.h
+++ b/xbmc/cores/dvdplayer/DVDPlayerAudio.h
@@ -36,7 +36,6 @@
class CDVDPlayer;
class CDVDAudioCodec;
-class IAudioCallback;
class CDVDAudioCodec;
#define DECODE_FLAG_DROP 1
@@ -111,9 +110,6 @@ public:
bool OpenStream(CDVDStreamInfo &hints);
void CloseStream(bool bWaitForBuffers);
- void RegisterAudioCallback(IAudioCallback* pCallback) { m_dvdAudio.RegisterAudioCallback(pCallback); }
- void UnRegisterAudioCallback() { m_dvdAudio.UnRegisterAudioCallback(); }
-
void SetSpeed(int speed);
void Flush();
diff --git a/xbmc/cores/dvdplayer/IDVDPlayer.h b/xbmc/cores/dvdplayer/IDVDPlayer.h
index 76719d0624..cd8abfdc78 100644
--- a/xbmc/cores/dvdplayer/IDVDPlayer.h
+++ b/xbmc/cores/dvdplayer/IDVDPlayer.h
@@ -25,7 +25,6 @@
template <typename T> class CRectGen;
typedef CRectGen<float> CRect;
-class IAudioCallback;
class DVDNavResult;
@@ -99,8 +98,6 @@ public:
bool SetPriority(const int iPriority) { return true; }
virtual bool OpenStream(CDVDStreamInfo &hints) = 0;
virtual void CloseStream(bool bWaitForBuffers) = 0;
- virtual void RegisterAudioCallback(IAudioCallback* pCallback) = 0;
- virtual void UnRegisterAudioCallback() = 0;
virtual void SetSpeed(int speed) = 0;
virtual void Flush() = 0;
virtual void WaitForBuffers() = 0;
diff --git a/xbmc/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp
index a2f9b0cffa..7e854410eb 100644
--- a/xbmc/cores/omxplayer/OMXAudio.cpp
+++ b/xbmc/cores/omxplayer/OMXAudio.cpp
@@ -65,7 +65,6 @@ static const uint16_t DTSFSCod [] = {0, 8000, 16000, 32000, 0, 0, 11025, 22050
//////////////////////////////////////////////////////////////////////
//***********************************************************************************************
COMXAudio::COMXAudio() :
- m_pCallback (NULL ),
m_Initialized (false ),
m_CurrentVolume (0 ),
m_Mute (false ),
@@ -1393,25 +1392,6 @@ int COMXAudio::SetPlaySpeed(int iSpeed)
return 0;
}
-void COMXAudio::RegisterAudioCallback(IAudioCallback *pCallback)
-{
- CSingleLock lock (m_critSection);
- if(!m_Passthrough && !m_HWDecode)
- {
- m_pCallback = pCallback;
- if (m_pCallback)
- m_pCallback->OnInitialize(2, m_SampleRate, 32);
- }
- else
- m_pCallback = NULL;
-}
-
-void COMXAudio::UnRegisterAudioCallback()
-{
- CSingleLock lock (m_critSection);
- m_pCallback = NULL;
-}
-
unsigned int COMXAudio::GetAudioRenderingLatency() const
{
CSingleLock lock (m_critSection);
diff --git a/xbmc/cores/omxplayer/OMXAudio.h b/xbmc/cores/omxplayer/OMXAudio.h
index c86c1d1c8d..85a0b98d19 100644
--- a/xbmc/cores/omxplayer/OMXAudio.h
+++ b/xbmc/cores/omxplayer/OMXAudio.h
@@ -29,7 +29,6 @@
#include "cores/AudioEngine/Utils/AEAudioFormat.h"
#include "cores/AudioEngine/Utils/AEUtil.h"
-#include "cores/IAudioCallback.h"
#include "linux/PlatformDefs.h"
#include "DVDStreamInfo.h"
@@ -55,8 +54,6 @@ extern "C" {
class COMXAudio
{
public:
- void UnRegisterAudioCallback();
- void RegisterAudioCallback(IAudioCallback* pCallback);
unsigned int GetChunkLen();
float GetDelay();
float GetCacheTime();
@@ -101,7 +98,6 @@ public:
float GetMaxLevel(double &pts);
private:
- IAudioCallback* m_pCallback;
bool m_Initialized;
float m_CurrentVolume;
bool m_Mute;
diff --git a/xbmc/cores/omxplayer/OMXPlayerAudio.h b/xbmc/cores/omxplayer/OMXPlayerAudio.h
index 16b85e9a2f..2397db4753 100644
--- a/xbmc/cores/omxplayer/OMXPlayerAudio.h
+++ b/xbmc/cores/omxplayer/OMXPlayerAudio.h
@@ -99,8 +99,6 @@ public:
double GetCurrentPts() { return m_audioClock; };
void SubmitEOS();
- void RegisterAudioCallback(IAudioCallback* pCallback) { m_omxAudio.RegisterAudioCallback(pCallback); }
- void UnRegisterAudioCallback() { m_omxAudio.UnRegisterAudioCallback(); }
void SetVolume(float fVolume) { m_omxAudio.SetVolume(fVolume); }
void SetMute(bool bOnOff) { m_omxAudio.SetMute(bOnOff); }
void SetDynamicRangeCompression(long drc) { m_omxAudio.SetDynamicRangeCompression(drc); }
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-30 07:50:53 +0000