From 956ec70f0d5ed9e9180fe307c183f9465ca64287 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Nov 13 2009 18:12:01 +0000
Subject: Make musepack output time work


---

diff --git a/audacious-plugins-2.1-musepack.patch b/audacious-plugins-2.1-musepack.patch
index f0fdcbe..eb83121 100644
--- a/audacious-plugins-2.1-musepack.patch
+++ b/audacious-plugins-2.1-musepack.patch
@@ -1,6 +1,6 @@
-diff -Nur audacious-plugins-2.1-orig/src/musepack/libmpc.cxx audacious-plugins-2.1-musepack/src/musepack/libmpc.cxx
---- audacious-plugins-2.1-orig/src/musepack/libmpc.cxx	2009-07-07 00:40:36.000000000 +0200
-+++ audacious-plugins-2.1-musepack/src/musepack/libmpc.cxx	2009-11-13 17:39:03.021816893 +0100
+diff -Nur audacious-plugins-fedora-2.1-orig/src/musepack/libmpc.cxx audacious-plugins-fedora-2.1-musepack/src/musepack/libmpc.cxx
+--- audacious-plugins-fedora-2.1-orig/src/musepack/libmpc.cxx	2009-07-07 00:40:36.000000000 +0200
++++ audacious-plugins-fedora-2.1-musepack/src/musepack/libmpc.cxx	2009-11-13 19:08:48.066816546 +0100
 @@ -48,7 +48,6 @@
  static MpcDecoder   mpcDecoder   = {0};
  static TrackInfo    track        = {0};
@@ -9,15 +9,17 @@ diff -Nur audacious-plugins-2.1-orig/src/musepack/libmpc.cxx audacious-plugins-2
  static GStaticMutex threadMutex = G_STATIC_MUTEX_INIT;
  
  /*
-@@ -301,7 +300,6 @@
+@@ -301,24 +300,21 @@
      mpcDecoder.isAlive  = true;
      mpcDecoder.isOutput = false;
      mpcDecoder.isPause  = false;
 -    threadHandle = g_thread_self();
++    data->playing = TRUE;
      data->set_pb_ready(data);
      decodeStream(data);
++    data->playing = FALSE;
  }
-@@ -309,16 +307,12 @@
+ 
  static void mpcStop(InputPlayback *data)
  {
      setAlive(false);
@@ -34,7 +36,7 @@ diff -Nur audacious-plugins-2.1-orig/src/musepack/libmpc.cxx audacious-plugins-2
  }
  
  static void mpcPause(InputPlayback *data, short p_Pause)
-@@ -833,8 +827,7 @@
+@@ -833,8 +829,7 @@
  
          lockAcquire();
          short iPlaying = data->output->buffer_playing()? 1 : 0;
@@ -44,7 +46,7 @@ diff -Nur audacious-plugins-2.1-orig/src/musepack/libmpc.cxx audacious-plugins-2
          {
              unsigned status = processBuffer(data, sampleBuffer, xmmsBuffer, decoder);
              if (status == (unsigned) (-1))
-@@ -860,7 +853,6 @@
+@@ -860,7 +855,6 @@
          else
          {
              lockRelease();
@@ -52,7 +54,7 @@ diff -Nur audacious-plugins-2.1-orig/src/musepack/libmpc.cxx audacious-plugins-2
          }
      }
      return endThread(filename, input, false);
-@@ -911,12 +903,12 @@
+@@ -911,12 +905,12 @@
  
  inline static void lockAcquire()
  {
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 14d0300..f6514fb 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -251,7 +251,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Nov 13 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.1-15
+* Fri Nov 13 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.1-16
+- Make musepack output time work.
 - Patch musepack plugin to remove old cruft and fix playback.
 
 * Sun Nov  8 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 2.1-13