Remove unused global 'stopping' and remove unused mutex code. Updates #997.
Originally committed to SVN as r3433.
This commit is contained in:
parent
2df6b2fd38
commit
5ea99a65e7
2 changed files with 0 additions and 18 deletions
|
@ -72,7 +72,6 @@ PortAudioPlayer::PortAudioPlayer() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Variables
|
// Variables
|
||||||
stopping = false;
|
|
||||||
volume = 1.0f;
|
volume = 1.0f;
|
||||||
paStart = 0.0;
|
paStart = 0.0;
|
||||||
}
|
}
|
||||||
|
@ -153,9 +152,6 @@ void PortAudioPlayer::paStreamFinishedCallback(void *userData) {
|
||||||
void PortAudioPlayer::Play(int64_t start,int64_t count) {
|
void PortAudioPlayer::Play(int64_t start,int64_t count) {
|
||||||
PaError err;
|
PaError err;
|
||||||
|
|
||||||
// Stop if it's already playing
|
|
||||||
wxMutexLocker locker(PAMutex);
|
|
||||||
|
|
||||||
// Set values
|
// Set values
|
||||||
endPos = start + count;
|
endPos = start + count;
|
||||||
playPos = start;
|
playPos = start;
|
||||||
|
@ -189,9 +185,6 @@ void PortAudioPlayer::Play(int64_t start,int64_t count) {
|
||||||
/// @param timerToo Stop display timer?
|
/// @param timerToo Stop display timer?
|
||||||
///
|
///
|
||||||
void PortAudioPlayer::Stop(bool timerToo) {
|
void PortAudioPlayer::Stop(bool timerToo) {
|
||||||
//wxMutexLocker locker(PAMutex);
|
|
||||||
//softStop = false;
|
|
||||||
|
|
||||||
// Stop stream
|
// Stop stream
|
||||||
Pa_StopStream (stream);
|
Pa_StopStream (stream);
|
||||||
|
|
||||||
|
|
|
@ -59,12 +59,6 @@ private:
|
||||||
/// DOCME
|
/// DOCME
|
||||||
static int pa_refcount;
|
static int pa_refcount;
|
||||||
|
|
||||||
/// PortAudio Mutex
|
|
||||||
wxMutex PAMutex;
|
|
||||||
|
|
||||||
/// Is playback being stopped?
|
|
||||||
volatile bool stopping;
|
|
||||||
|
|
||||||
/// Current volume level.
|
/// Current volume level.
|
||||||
float volume;
|
float volume;
|
||||||
|
|
||||||
|
@ -136,11 +130,6 @@ public:
|
||||||
double GetVolume() { return volume; }
|
double GetVolume() { return volume; }
|
||||||
|
|
||||||
wxArrayString GetOutputDevices(wxString favorite);
|
wxArrayString GetOutputDevices(wxString favorite);
|
||||||
|
|
||||||
/// @brief Get Mutex
|
|
||||||
/// @return Current Mutex
|
|
||||||
///
|
|
||||||
wxMutex *GetMutex() { return &PAMutex; }
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue