diff options
author | davilla <davilla@4pi.com> | 2011-05-20 08:00:26 -0700 |
---|---|---|
committer | davilla <davilla@4pi.com> | 2011-05-20 08:00:26 -0700 |
commit | 812a5ca8b9cfef98bf1be9f3cd1a42af987b3381 (patch) | |
tree | 257c1ec17870ce00f651e8c876b15b3dbb59b7b9 | |
parent | e753cc3219811205c14aa8d393f693e2e29ba2c4 (diff) | |
parent | 5f54063b3352b0fd0df46cc8b1a0396a2ee17b75 (diff) |
Merge pull request #148 from davilla/remove_ResetPlayTime
removed unused CApplication::ResetPlayTime, PAPlayer::ResetTime() and IPlayer::ResetTime(), not used within xbmc
-rw-r--r-- | xbmc/Application.cpp | 6 | ||||
-rw-r--r-- | xbmc/Application.h | 1 | ||||
-rw-r--r-- | xbmc/cores/IPlayer.h | 1 | ||||
-rw-r--r-- | xbmc/cores/paplayer/PAPlayer.cpp | 5 | ||||
-rw-r--r-- | xbmc/cores/paplayer/PAPlayer.h | 1 |
5 files changed, 0 insertions, 14 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index 6c865dc8a9..92025255f6 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp @@ -5093,12 +5093,6 @@ double CApplication::GetTotalTime() const return rc; } -void CApplication::ResetPlayTime() -{ - if (IsPlaying() && m_pPlayer) - m_pPlayer->ResetTime(); -} - void CApplication::StopShutdownTimer() { if (m_shutdownTimer.IsRunning()) diff --git a/xbmc/Application.h b/xbmc/Application.h index 38a5e5c34e..c550eae372 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -191,7 +191,6 @@ public: void SeekPercentage(float percent); void SeekTime( double dTime = 0.0 ); - void ResetPlayTime(); void StopShutdownTimer(); void ResetShutdownTimers(); diff --git a/xbmc/cores/IPlayer.h b/xbmc/cores/IPlayer.h index a7c2d6018a..ef3de4afa5 100644 --- a/xbmc/cores/IPlayer.h +++ b/xbmc/cores/IPlayer.h @@ -133,7 +133,6 @@ public: virtual float GetActualFPS() { return 0.0f; }; virtual void SeekTime(__int64 iTime = 0){}; virtual __int64 GetTime(){ return 0;}; - virtual void ResetTime() {}; virtual int GetTotalTime(){ return 0;}; virtual int GetAudioBitrate(){ return 0;} virtual int GetVideoBitrate(){ return 0;} diff --git a/xbmc/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp index 46c62bf4bf..6f3fc9f1a0 100644 --- a/xbmc/cores/paplayer/PAPlayer.cpp +++ b/xbmc/cores/paplayer/PAPlayer.cpp @@ -759,11 +759,6 @@ bool PAPlayer::ProcessPAP() return true; } -void PAPlayer::ResetTime() -{ - m_bytesSentOut = 0; -} - __int64 PAPlayer::GetTime() { __int64 timeplus = m_BytesPerSecond ? (__int64)(((float) m_bytesSentOut / (float) m_BytesPerSecond ) * 1000.0) : 0; diff --git a/xbmc/cores/paplayer/PAPlayer.h b/xbmc/cores/paplayer/PAPlayer.h index f670bce602..5a3192f2ff 100644 --- a/xbmc/cores/paplayer/PAPlayer.h +++ b/xbmc/cores/paplayer/PAPlayer.h @@ -85,7 +85,6 @@ public: virtual int GetSampleRate(); virtual CStdString GetAudioCodecName(); virtual __int64 GetTime(); - virtual void ResetTime(); virtual void SeekTime(__int64 iTime = 0); // Skip to next track/item inside the current media (if supported). virtual bool SkipNext(); |