rpms/audacious-plugins/devel audacious-plugins-2.2-beta1-modplug.patch, NONE, 1.1 audacious-plugins.spec, 1.55, 1.56

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20224

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


audacious-plugins-2.2-beta1-modplug.patch:
 modplugbmp.cxx |   23 ++++++-----------------
 modplugbmp.h   |    1 -
 2 files changed, 6 insertions(+), 18 deletions(-)

--- NEW FILE audacious-plugins-2.2-beta1-modplug.patch ---
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/modplug/modplugbmp.cxx audacious-plugins-fedora-2.2-beta1-modplug/src/modplug/modplugbmp.cxx
--- audacious-plugins-fedora-2.2-beta1-orig/src/modplug/modplugbmp.cxx	2009-10-20 23:37:24.000000000 +0200
+++ audacious-plugins-fedora-2.2-beta1-modplug/src/modplug/modplugbmp.cxx	2009-10-24 23:47:44.000000000 +0200
@@ -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,
@@ -423,15 +414,16 @@
 	);
 	mPlayed = 0;
 
-        Tuple* ti = GetSongTuple( aFilename );
-        if ( ti )
-                aModName = format_and_free_ti( ti, &aLength );
+    Tuple* ti = GetSongTuple( aFilename );
+    if ( ti ) {
+        ipb->set_tuple(ipb,ti);
+    }
 
 	ipb->set_params
 	(
 		ipb,
-		aModName,
-		aLength,
+		NULL,
+		0,
 		mSoundFile->GetNumChannels() * 1000,
 		mModProps.mFrequency,
 		mModProps.mChannels
@@ -464,9 +456,6 @@
 
 	mStopped = true;
 	mPaused = false;
-	
-	g_thread_join(ipb->thread);
-	ipb->thread = NULL;
 }
 
 void ModplugXMMS::Pause(bool aPaused)
diff -Nur audacious-plugins-fedora-2.2-beta1-orig/src/modplug/modplugbmp.h audacious-plugins-fedora-2.2-beta1-modplug/src/modplug/modplugbmp.h
--- audacious-plugins-fedora-2.2-beta1-orig/src/modplug/modplugbmp.h	2009-10-20 23:37:24.000000000 +0200
+++ audacious-plugins-fedora-2.2-beta1-modplug/src/modplug/modplugbmp.h	2009-10-24 23:44:09.000000000 +0200
@@ -126,7 +126,6 @@
 	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/devel/audacious-plugins.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- audacious-plugins.spec	22 Oct 2009 15:55:49 -0000	1.55
+++ audacious-plugins.spec	24 Oct 2009 22:20:54 -0000	1.56
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 0.1.beta1%{?dist}
+Release: 0.2.beta1%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -24,6 +24,7 @@ Source0: audacious-plugins-fedora-%{vers
 
 Patch2: audacious-plugins-2.0.1-xmms-skindir.patch
 Patch3: audacious-plugins-2.2-beta1-pulseaudio.patch
+Patch4: audacious-plugins-2.2-beta1-modplug.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -147,6 +148,7 @@ vortex compressed files.
 
 %patch2 -p1 -b .xmms-skindir
 %patch3 -p1 -b .add-pulseaudio
+%patch4 -p1 -b .modplug
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -229,6 +231,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.2.beta1
+- Patch modplug plugin to remove old cruft and fix playback.
+
 * Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
 - Upgrade to 2.2-beta1
 - Port old pulse_audio plugin from Audacious 2.1