actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove id, registration; no longer needed

Browse Source
This commit is contained in:
Glenn Maynard
2006-12-23 10:02:08 +00:00
parent 50957c4a21
commit e7c9bb14c4
2 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
-15
View File
@@ -70,8 +70,6 @@ RageSound::RageSound():
m_iMaxDriverFrame = 0; m_iMaxDriverFrame = 0;
m_bPlaying = false; m_bPlaying = false;
m_iID = SOUNDMAN->GetUniqueID();
/* Register ourself last, once everything is initialized. */ /* Register ourself last, once everything is initialized. */
SOUNDMAN->RegisterSound( this ); SOUNDMAN->RegisterSound( this );
} }
@@ -93,12 +91,6 @@ RageSound::RageSound( const RageSound &cpy ):
m_pSource = NULL; m_pSource = NULL;
*this = cpy; *this = cpy;
/* We have a different ID than our parent. */
m_iID = SOUNDMAN->GetUniqueID();
/* Register ourself. */
SOUNDMAN->RegisterSound( this );
} }
RageSound &RageSound::operator=( const RageSound &cpy ) RageSound &RageSound::operator=( const RageSound &cpy )
@@ -365,13 +357,6 @@ void RageSound::StopPlaying()
m_HardwareToStreamMap.Clear(); m_HardwareToStreamMap.Clear();
m_StreamToSourceMap.Clear(); m_StreamToSourceMap.Clear();
/* We may still have positions queued up in RageSoundManager. We need to make sure
* that we don't accept those; otherwise, if we start playing again quickly, they'll
* confuse GetPositionSeconds(). Do this by changing our ID. */
SOUNDMAN->UnregisterSound( this );
m_iID = SOUNDMAN->GetUniqueID();
SOUNDMAN->RegisterSound( this );
// LOG->Trace("StopPlaying %p finished (%s)", this, this->GetLoadedFilePath().c_str()); // LOG->Trace("StopPlaying %p finished (%s)", this, this->GetLoadedFilePath().c_str());
m_Mutex.Unlock(); m_Mutex.Unlock();
stepmania/src/RageSound.h
-4
View File
@@ -135,7 +135,6 @@ public:
float GetPlaybackRate() const; float GetPlaybackRate() const;
RageTimer GetStartTime() const; RageTimer GetStartTime() const;
float GetAbsoluteVolume() const; // factors in SOUNDMAN->GetMixVolume() float GetAbsoluteVolume() const; // factors in SOUNDMAN->GetMixVolume()
int GetID() const { return m_iID; }
void SetParams( const RageSoundParams &p ); void SetParams( const RageSoundParams &p );
const RageSoundParams &GetParams() const { return m_Param; } const RageSoundParams &GetParams() const { return m_Param; }
bool SetProperty( const RString &sProperty, float fValue ); bool SetProperty( const RString &sProperty, float fValue );
@@ -175,9 +174,6 @@ private:
/* Keep track of the max SOUNDMAN->GetPosition result (see GetPositionSecondsInternal). */ /* Keep track of the max SOUNDMAN->GetPosition result (see GetPositionSecondsInternal). */
mutable int64_t m_iMaxDriverFrame; mutable int64_t m_iMaxDriverFrame;
/* Unique ID number for this instance of RageSound. */
int m_iID;
RString m_sError; RString m_sError;
int64_t GetPositionSecondsInternal( bool *bApproximate = NULL, RageTimer *pTimer = NULL ) const; int64_t GetPositionSecondsInternal( bool *bApproximate = NULL, RageTimer *pTimer = NULL ) const;