mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Rome^WreadPlayPos must die.

Browse source 
Originally committed to SVN as r347.
This commit is contained in:
David Lamparter 2006-04-17 01:00:40 +00:00
parent 902bc68b85
commit 656beb2dc2
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/audio_player_portaudio.cpp
View file

@ -120,7 +120,6 @@ int PortAudioPlayer::paCallback(void *inputBuffer, void *outputBuffer, unsigned
// Set play position (and real one)
player->playPos += framesPerBuffer;
player->realPlayPos = player->playPos - (outTime - Pa_StreamTime(player->stream));
// Cap to start if lower
return end;
@ -135,7 +134,6 @@ void PortAudioPlayer::Play(__int64 start,__int64 count) {
// Set values
endPos = start + count;
realPlayPos = start;
playPos = start;
startPos = start;
@ -162,7 +160,6 @@ void PortAudioPlayer::Stop(bool timerToo) {
// Stop stream
playing = false;
Pa_StopStream (stream);
realPlayPos = 0;
// Stop timer
if (timerToo && displayTimer) {

5
core/audio_player_portaudio.h
View file

@ -59,7 +59,6 @@ private:
volatile __int64 playPos;
volatile __int64 startPos;
volatile __int64 endPos;
volatile __int64 realPlayPos;
void *stream;
static int paCallback(void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, PaTimestamp outTime, void *userData);
@ -77,9 +76,9 @@ public:
__int64 GetStartPosition() { return startPos; }
__int64 GetEndPosition() { return endPos; }
__int64 GetCurrentPosition() { return realPlayPos; }
__int64 GetCurrentPosition() { return playPos; }
void SetEndPosition(__int64 pos) { endPos = pos; }
void SetCurrentPosition(__int64 pos) { playPos = pos; realPlayPos = pos; }
void SetCurrentPosition(__int64 pos) { playPos = pos; }
void SetVolume(double vol) { volume = vol; }
double GetVolume() { return volume; }