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