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

stream frames are 64-bit

Browse Source
This commit is contained in:
Glenn Maynard
2006-11-30 05:55:42 +00:00
parent 5da7b5a8a4
commit 7af5741c08
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSound.cpp
+1 -2
View File
@@ -410,8 +410,7 @@ bool RageSound::GetDataToPlay( int16_t *pBuffer, int iFrames, int &iStreamFrame,
} }
/* Indicate that a block of audio data has been written to the device. */ /* Indicate that a block of audio data has been written to the device. */
// XXX: pos should be int64_t void RageSound::CommitPlayingPosition( int64_t frameno, int64_t pos, int iGotFrames )
void RageSound::CommitPlayingPosition( int64_t frameno, int pos, int iGotFrames )
{ {
m_Mutex.Lock(); m_Mutex.Lock();
m_HardwareToStreamMap.Insert( frameno, iGotFrames, pos ); m_HardwareToStreamMap.Insert( frameno, iGotFrames, pos );
stepmania/src/RageSound.h
+1 -1
View File
@@ -193,7 +193,7 @@ public:
* is still playing. */ * is still playing. */
int GetPCM( char *pBuffer, int iSize, int64_t iFrameno ); int GetPCM( char *pBuffer, int iSize, int64_t iFrameno );
bool GetDataToPlay( int16_t *pBuffer, int iSize, int &iPosition, int &iBytesRead ); bool GetDataToPlay( int16_t *pBuffer, int iSize, int &iPosition, int &iBytesRead );
void CommitPlayingPosition( int64_t iFrameno, int iPosition, int iBytesRead ); void CommitPlayingPosition( int64_t iFrameno, int64_t iPosition, int iBytesRead );
}; };
#endif #endif
stepmania/src/RageSoundManager.cpp
+1 -1
View File
@@ -183,7 +183,7 @@ int RageSoundManager::GetUniqueID()
return ++iID; return ++iID;
} }
void RageSoundManager::CommitPlayingPosition( int ID, int64_t frameno, int pos, int got_frames ) void RageSoundManager::CommitPlayingPosition( int ID, int64_t frameno, int64_t pos, int got_frames )
{ {
/* This can be called from realtime threads; don't lock any mutexes. */ /* This can be called from realtime threads; don't lock any mutexes. */
queued_pos_map_t p; queued_pos_map_t p;
stepmania/src/RageSoundManager.h
+3 -2
View File
@@ -41,7 +41,7 @@ public:
void RegisterSound( RageSound *p ); /* used by RageSound */ void RegisterSound( RageSound *p ); /* used by RageSound */
void UnregisterSound( RageSound *p ); /* used by RageSound */ void UnregisterSound( RageSound *p ); /* used by RageSound */
int GetUniqueID(); /* used by RageSound */ int GetUniqueID(); /* used by RageSound */
void CommitPlayingPosition( int ID, int64_t frameno, int pos, int got_bytes ); /* used by drivers */ void CommitPlayingPosition( int ID, int64_t frameno, int64_t pos, int got_bytes ); /* used by drivers */
float GetPlayLatency() const; float GetPlayLatency() const;
int GetDriverSampleRate( int iRate ) const; int GetDriverSampleRate( int iRate ) const;
@@ -76,8 +76,9 @@ private:
struct queued_pos_map_t struct queued_pos_map_t
{ {
int ID, pos, got_frames; int ID, got_frames;
int64_t frameno; int64_t frameno;
int64_t pos;
}; };
CircBuf<queued_pos_map_t> pos_map_queue; CircBuf<queued_pos_map_t> pos_map_queue;