From 5ea99a65e772113f064a12ab3411773130379447 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Fri, 21 Aug 2009 20:28:43 +0000
Subject: [PATCH] Remove unused global 'stopping' and remove unused mutex code.
 Updates #997.

Originally committed to SVN as r3433.
---
 aegisub/src/audio_player_portaudio.cpp |  7 -------
 aegisub/src/audio_player_portaudio.h   | 11 -----------
 2 files changed, 18 deletions(-)

diff --git a/aegisub/src/audio_player_portaudio.cpp b/aegisub/src/audio_player_portaudio.cpp
index 51d576843..e15468d8f 100644
--- a/aegisub/src/audio_player_portaudio.cpp
+++ b/aegisub/src/audio_player_portaudio.cpp
@@ -72,7 +72,6 @@ PortAudioPlayer::PortAudioPlayer() {
 	}
 
 	// Variables
-	stopping = false;
 	volume = 1.0f;
 	paStart = 0.0;
 }
@@ -153,9 +152,6 @@ void PortAudioPlayer::paStreamFinishedCallback(void *userData) {
 void PortAudioPlayer::Play(int64_t start,int64_t count) {
 	PaError err;
 
-	// Stop if it's already playing
-	wxMutexLocker locker(PAMutex);
-
 	// Set values
 	endPos = start + count;
 	playPos = start;
@@ -189,9 +185,6 @@ void PortAudioPlayer::Play(int64_t start,int64_t count) {
 /// @param timerToo Stop display timer?
 ///
 void PortAudioPlayer::Stop(bool timerToo) {
-	//wxMutexLocker locker(PAMutex);
-	//softStop = false;
-
 	// Stop stream
 	Pa_StopStream (stream);
 
diff --git a/aegisub/src/audio_player_portaudio.h b/aegisub/src/audio_player_portaudio.h
index b3a6be382..80fe11838 100644
--- a/aegisub/src/audio_player_portaudio.h
+++ b/aegisub/src/audio_player_portaudio.h
@@ -59,12 +59,6 @@ private:
 	/// DOCME
 	static int pa_refcount;
 
-	/// PortAudio Mutex
-	wxMutex PAMutex;
-
-	/// Is playback being stopped?
-	volatile bool stopping;
-
 	/// Current volume level.
 	float volume;
 
@@ -136,11 +130,6 @@ public:
 	double GetVolume() { return volume; }
 
 	wxArrayString GetOutputDevices(wxString favorite);
-
-	/// @brief Get Mutex
-	/// @return Current Mutex
-	///
-	wxMutex *GetMutex() { return &PAMutex; }
 };