This commit is contained in:
Glenn Maynard
2004-04-20 03:55:36 +00:00
parent b82a155fe7
commit 7ffad5c4f6
3 changed files with 2 additions and 14 deletions
+2 -9
View File
@@ -70,7 +70,7 @@ RageSound::RageSound():
playing_thread = 0; playing_thread = 0;
databuf.reserve(internal_buffer_size); databuf.reserve(internal_buffer_size);
/* Register ourself, so we have a unique ID and receive Update()s. */ /* Register ourself. */
ID = SOUNDMAN->RegisterSound( this ); ID = SOUNDMAN->RegisterSound( this );
} }
@@ -97,8 +97,7 @@ RageSound::RageSound(const RageSound &cpy):
*this = cpy; *this = cpy;
/* Register ourself, so we receive Update()s. We have a different ID than /* Register ourself. We have a different ID than our parent. */
* our parent. */
ID = SOUNDMAN->RegisterSound( this ); ID = SOUNDMAN->RegisterSound( this );
} }
@@ -193,12 +192,6 @@ bool RageSound::Load(CString sSoundFilePath, int precache)
return true; return true;
} }
void RageSound::Update(float delta)
{
/* Erase old pos_map data. */
// CleanPosMap( pos_map );
}
/* Return the number of bytes available in the input buffer. */ /* Return the number of bytes available in the input buffer. */
int RageSound::Bytes_Available() const int RageSound::Bytes_Available() const
{ {
-1
View File
@@ -182,7 +182,6 @@ public:
int GetPCM( char *buffer, int size, int64_t frameno ); int GetPCM( char *buffer, int size, int64_t frameno );
bool GetDataToPlay( int16_t *buffer, int size, int &pos, int &got_bytes ); bool GetDataToPlay( int16_t *buffer, int size, int &pos, int &got_bytes );
void CommitPlayingPosition( int64_t frameno, int pos, int got_bytes ); void CommitPlayingPosition( int64_t frameno, int pos, int got_bytes );
void Update(float delta);
}; };
#endif #endif
-4
View File
@@ -108,10 +108,6 @@ void RageSoundManager::Update(float delta)
delete *it; delete *it;
g_DeletionMutex.Unlock(); g_DeletionMutex.Unlock();
// for(set<RageSound *>::iterator i = all_sounds.begin();
// i != all_sounds.end(); ++i)
// (*i)->Update(delta);
driver->Update(delta); driver->Update(delta);
} }