rpms/audacious-plugins/F-12 audacious-plugins-2.1-modplug.patch, NONE, 1.1 audacious-plugins.spec, 1.54, 1.55

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10479

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.1-modplug.patch 
Log Message:
* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-8
- Patch modplug plugin to remove old cruft and fix playback.


audacious-plugins-2.1-modplug.patch:
 modplugbmp.cxx |   13 -------------
 modplugbmp.h   |    3 ---
 2 files changed, 16 deletions(-)

--- NEW FILE audacious-plugins-2.1-modplug.patch ---
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);
 };
 


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- audacious-plugins.spec	21 Oct 2009 20:56:58 -0000	1.54
+++ audacious-plugins.spec	25 Oct 2009 11:32:13 -0000	1.55
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -28,6 +28,7 @@ Patch3: audacious-plugins-2.1-alsa-ng.pa
 Patch4: audacious-plugins-2.1-underruns.patch
 Patch5: audacious-plugins-2.1-pulseaudio-volume.patch
 Patch6: audacious-plugins-2.1-pulseaudio-volume-accuracy.patch
+Patch7: audacious-plugins-2.1-modplug.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -154,6 +155,7 @@ vortex compressed files.
 %patch4 -p1 -b .underruns
 %patch5 -p1 -b .pulseaudio-volume
 %patch6 -p1 -b .pulseaudio-volume-accuracy
+%patch7 -p1 -b .modplug
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -237,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-8
+- Patch modplug plugin to remove old cruft and fix playback.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-7
 - Patch pulseaudio plugin to not suffer from precision loss when
   calculating the volume level to save.