From 06d90b82b59698d5bba9a59402ca63c855cbcb2d Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Nov 17 2009 19:46:01 +0000
Subject: prepare test-update, needs some testing while thinking about it

    furtheraudacious-plugins-1.5.1-musepack.patch

---

diff --git a/audacious-plugins-1.5.1-musepack.patch b/audacious-plugins-1.5.1-musepack.patch
index 7947c50..c8aae82 100644
--- a/audacious-plugins-1.5.1-musepack.patch
+++ b/audacious-plugins-1.5.1-musepack.patch
@@ -1,6 +1,6 @@
 diff -Nur audacious-plugins-fedora-1.5.1-orig/src/musepack/libmpc.cxx audacious-plugins-fedora-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-fedora-1.5.1-musepack/src/musepack/libmpc.cxx	2009-11-17 12:43:47.459927692 +0100
++++ audacious-plugins-fedora-1.5.1-musepack/src/musepack/libmpc.cxx	2009-11-17 20:44:19.953532318 +0100
 @@ -52,8 +52,7 @@
  static MpcDecoder   mpcDecoder   = {0};
  static TrackInfo    track        = {0};
@@ -11,13 +11,12 @@ diff -Nur audacious-plugins-fedora-1.5.1-orig/src/musepack/libmpc.cxx audacious-
  
  /*
   * VFS callback implementation, adapted from mpc_reader.c.
-@@ -305,24 +304,21 @@
+@@ -305,24 +304,19 @@
      mpcDecoder.isAlive  = true;
      mpcDecoder.isOutput = false;
      mpcDecoder.isPause  = false;
 -    threadHandle = g_thread_self();
-+    data->playing = TRUE;
-     data->set_pb_ready(data);
+-    data->set_pb_ready(data);
      decodeStream(data);
 +    data->playing = FALSE;
  }
@@ -38,11 +37,13 @@ diff -Nur audacious-plugins-fedora-1.5.1-orig/src/musepack/libmpc.cxx audacious-
  }
  
  static void mpcPause(InputPlayback *data, short p_Pause)
-@@ -827,7 +823,7 @@
+@@ -827,7 +821,9 @@
      lockRelease();
  
      gint counter = 2 * track.sampleFreq / 3;
 -    while (isAlive())
++    data->playing = TRUE;
++    data->set_pb_ready(data);
 +    while (isAlive() && data->playing)
      {
          if (getOffset() != -1)
@@ -78,7 +79,7 @@ diff -Nur audacious-plugins-fedora-1.5.1-orig/src/musepack/libmpc.cxx audacious-
  }
  
 -static int processBuffer(InputPlayback *playback, 
-+static gint processBuffer(InputPlayback *playback, 
++static guint processBuffer(InputPlayback *playback, 
      MPC_SAMPLE_FORMAT* sampleBuffer, char* xmmsBuffer, mpc_decoder& decoder)
  {
      mpc_uint32_t vbrAcc = 0;