rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-modplug.patch, NONE, 1.1 audacious-plugins-1.5.1-musepack.patch, NONE, 1.1 audacious-plugins.spec, 1.41, 1.42
Michael Schwendt
mschwendt at fedoraproject.org
Fri Nov 13 16:34:03 UTC 2009
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14562/F-10
Modified Files:
audacious-plugins.spec
Added Files:
audacious-plugins-1.5.1-modplug.patch
audacious-plugins-1.5.1-musepack.patch
Log Message:
* Fri Nov 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-16
- Patch musepack plugin to remove old cruft and fix playback.
- Patch modplug plugin to remove old cruft and fix playback.
audacious-plugins-1.5.1-modplug.patch:
modplugbmp.cxx | 12 ------------
modplugbmp.h | 3 ---
2 files changed, 15 deletions(-)
--- NEW FILE audacious-plugins-1.5.1-modplug.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-orig/src/modplug/modplugbmp.cxx audacious-plugins-fedora-1.5.1-modplug/src/modplug/modplugbmp.cxx
--- audacious-plugins-fedora-1.5.1-orig/src/modplug/modplugbmp.cxx 2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1-modplug/src/modplug/modplugbmp.cxx 2009-11-13 16:49:54.063630198 +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,7 +442,6 @@
mModProps.mChannels
);
- mDecodeThread = g_thread_self();
ipb->set_pb_ready(ipb);
this->PlayLoop(ipb);
}
@@ -463,8 +453,6 @@
mStopped = true;
mPaused = false;
-
- g_thread_join(mDecodeThread);
}
void ModplugXMMS::Pause(bool aPaused)
diff -Nur audacious-plugins-fedora-1.5.1-orig/src/modplug/modplugbmp.h audacious-plugins-fedora-1.5.1-modplug/src/modplug/modplugbmp.h
--- audacious-plugins-fedora-1.5.1-orig/src/modplug/modplugbmp.h 2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-fedora-1.5.1-modplug/src/modplug/modplugbmp.h 2009-11-13 16:50:05.271631824 +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);
};
audacious-plugins-1.5.1-musepack.patch:
libmpc.cxx | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
--- NEW FILE audacious-plugins-1.5.1-musepack.patch ---
diff -Nur audacious-plugins-fedora-1.5.1-orig/src/musepack/libmpc.cxx audacious-plugins-1.5.1-musepack/src/musepack/libmpc.cxx
--- audacious-plugins-fedora-1.5.1-orig/src/musepack/libmpc.cxx 2008-06-08 10:37:44.000000000 +0200
+++ audacious-plugins-1.5.1-musepack/src/musepack/libmpc.cxx 2009-11-13 17:28:25.000000000 +0100
@@ -52,7 +52,6 @@
static MpcDecoder mpcDecoder = {0};
static TrackInfo track = {0};
-static GThread *threadHandle;
GStaticMutex threadMutex = G_STATIC_MUTEX_INIT;
/*
@@ -305,7 +304,6 @@
mpcDecoder.isAlive = true;
mpcDecoder.isOutput = false;
mpcDecoder.isPause = false;
- threadHandle = g_thread_self();
data->set_pb_ready(data);
decodeStream(data);
}
@@ -313,16 +311,12 @@
static void mpcStop(InputPlayback *data)
{
setAlive(false);
- if (threadHandle)
- {
- g_thread_join(threadHandle);
if (mpcDecoder.isOutput)
{
data->output->buffer_free();
data->output->close_audio();
mpcDecoder.isOutput = false;
}
- }
}
static void mpcPause(InputPlayback *data, short p_Pause)
@@ -837,8 +831,7 @@
lockAcquire();
short iPlaying = MpcPlugin.output->buffer_playing()? 1 : 0;
- gint iFree = MpcPlugin.output->buffer_free();
- if (!mpcDecoder.isPause && iFree >= ((1152 * 4) << iPlaying))
+ if (!mpcDecoder.isPause)
{
unsigned status = processBuffer(data, sampleBuffer, xmmsBuffer, decoder);
if (status == (unsigned) (-1))
@@ -864,7 +857,6 @@
else
{
lockRelease();
- g_usleep(10000);
}
}
return endThread(filename, input, false);
@@ -915,12 +907,12 @@
inline static void lockAcquire()
{
- g_static_mutex_lock(&threadMutex);
+ /* g_static_mutex_lock(&threadMutex); */
}
inline static void lockRelease()
{
- g_static_mutex_unlock(&threadMutex);
+ /* g_static_mutex_unlock(&threadMutex); */
}
inline static bool isAlive()
Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- audacious-plugins.spec 28 Oct 2009 13:53:27 -0000 1.41
+++ audacious-plugins.spec 13 Nov 2009 16:34:03 -0000 1.42
@@ -4,7 +4,7 @@
Name: audacious-plugins
Version: 1.5.1
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Plugins for the Audacious media player
Group: Applications/Multimedia
@@ -29,6 +29,8 @@ Patch8: audacious-plugins-1.5.1-
Patch9: audacious-plugins-1.5.1-pulseaudio-volume.patch
Patch10: audacious-plugins-1.5.1-pulseaudio-volume-accuracy.patch
Patch11: audacious-plugins-1.5.1-sndfile-playfix.patch
+Patch12: audacious-plugins-1.5.1-modplug.patch
+Patch13: audacious-plugins-1.5.1-musepack.patch
# alsa-ng plugin from 2.1 devel up to 2.2 alpha1
Patch50: audacious-plugins-1.5.1-alsa-ng.patch
@@ -184,6 +186,8 @@ vortex compressed files.
%patch10 -p1 -b .pulseaudio-volume-accuracy
%patch11 -p1 -b .sndfile-playfix
+%patch12 -p1 -b .modplug
+%patch13 -p1 -b .musepack
%patch50 -p1 -b .alsa-ng
%patch51 -p1 -b .alsa-ng2
@@ -283,6 +287,10 @@ update-desktop-database &> /dev/null ||
%changelog
+* Fri Nov 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-16
+- Patch musepack plugin to remove old cruft and fix playback.
+- Patch modplug plugin to remove old cruft and fix playback.
+
* Wed Oct 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-15
- Remove decode_thread from sndfile plugin to fix playback.
More information about the fedora-extras-commits
mailing list