1dc939d
diff -Nur audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.cxx audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.cxx
1dc939d
--- audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.cxx	2009-07-07 00:40:36.000000000 +0200
1dc939d
+++ audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.cxx	2009-10-25 12:21:52.524068282 +0100
1dc939d
@@ -295,15 +295,6 @@
1dc939d
 		if(mStopped)
1dc939d
 			break;
1dc939d
 	
1dc939d
-		//wait for buffer space to free up.
1dc939d
-		while(((mOutPlug->buffer_free()
1dc939d
-		    < (int)mBufSize))
1dc939d
-		   && (!mStopped))
1dc939d
-			usleep(10000);
1dc939d
-			
1dc939d
-		if(mStopped)
1dc939d
-			break;
1dc939d
-		
1dc939d
 		playback->pass_audio
1dc939d
 		(
1dc939d
 			playback,
1dc939d
@@ -451,8 +442,6 @@
1dc939d
 		mModProps.mChannels
1dc939d
 	);
1dc939d
 
1dc939d
-	mDecodeThread = g_thread_self();
1dc939d
-
1dc939d
 	ipb->playing = TRUE;
1dc939d
 	ipb->set_pb_ready(ipb);
1dc939d
 	this->PlayLoop(ipb);
1dc939d
@@ -466,8 +455,6 @@
1dc939d
 
1dc939d
 	mStopped = true;
1dc939d
 	mPaused = false;
1dc939d
-	
1dc939d
-	g_thread_join(mDecodeThread);
1dc939d
 }
1dc939d
 
1dc939d
 void ModplugXMMS::Pause(bool aPaused)
1dc939d
diff -Nur audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.h audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.h
1dc939d
--- audacious-plugins-fedora-2.1-orig/src/modplug/modplugbmp.h	2009-07-07 00:40:36.000000000 +0200
1dc939d
+++ audacious-plugins-fedora-2.1-modplug/src/modplug/modplugbmp.h	2009-10-25 12:20:58.578071107 +0100
1dc939d
@@ -121,14 +121,11 @@
1dc939d
 
1dc939d
 	uint32      mPlayed;
1dc939d
 
1dc939d
-	GThread*    mDecodeThread;
1dc939d
-
1dc939d
 	char        mModName[100];
1dc939d
 	
1dc939d
 	float mPreampFactor;
1dc939d
 
1dc939d
 	void PlayLoop(InputPlayback *);
1dc939d
-	static void* PlayThread(void* arg);
1dc939d
 	const char* Bool2OnOff(bool aValue);
1dc939d
 };
1dc939d