Changeset 144 for xmms-musepack/branches/r2d/src/libmpc.cpp

Timestamp:

11/17/06 21:05:30 (17 years ago)

Author:

r2d

Message:

• put back seeking

File:

• xmms-musepack/branches/r2d/src/libmpc.cpp (modified) (4 diffs)

xmms-musepack/branches/r2d/src/libmpc.cpp

@@ -801 +801 @@
 
         int counter = 2 * track.sampleFreq / 3;
-        unsigned status = 1;
+        int status = 0;
     while (isAlive())
     {
         if (getOffset() != -1)
         {
-//             mpc_decoder_seek_seconds(decoder, mpcDecoder.offset);
+                        mpc_demux_seek_second(demux, mpcDecoder.offset);
             setOffset(-1);
+                        status = 0;
         }
 
@@ -813 +814 @@
         short iPlaying = MpcPlugin.output->buffer_playing()? 1 : 0;
         int iFree = MpcPlugin.output->buffer_free();
-        if (!mpcDecoder.isPause &&  iFree >= ((1152 * 4) << iPlaying) && status != 0)
+        if (!mpcDecoder.isPause &&  iFree >= ((1152 * 4) << iPlaying) && status != -1)
         {
                         status = processBuffer(sampleBuffer, xmmsBuffer, *demux);
@@ -829 +830 @@
         {
                         lockRelease();
-                        if (!mpcDecoder.isPause && status == 0 && MpcPlugin.output->output_time() == 0)
+                        if (!mpcDecoder.isPause && status == -1 && MpcPlugin.output->output_time() == 0)
                                 break;
             xmms_usleep(100000);
@@ -845 +846 @@
         info.buffer = sampleBuffer;
         mpc_demux_decode(&demux, &info);
+
+        if (info.bits == -1) return -1; // end of stream
+
     copyBuffer(sampleBuffer, xmmsBuffer, info.samples);