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

Timestamp:

11/13/06 20:15:00 (17 years ago)

Author:

r2d

Message:

• added "live" bitrate
• added pns and gapless info

File:

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

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

@@ -512 +512 @@
         GtkWidget* streamLabel    = mpcGtkLabel(infoVbox);
         GtkWidget* encoderLabel   = mpcGtkLabel(infoVbox);
-        GtkWidget* profileLabel   = mpcGtkLabel(infoVbox);
+                GtkWidget* profileLabel   = mpcGtkLabel(infoVbox);
+                GtkWidget* pnsLabel       = mpcGtkLabel(infoVbox);
+                GtkWidget* gaplessLabel   = mpcGtkLabel(infoVbox);
         GtkWidget* bitrateLabel   = mpcGtkLabel(infoVbox);
         GtkWidget* rateLabel      = mpcGtkLabel(infoVbox);
@@ -535 +537 @@
             mpcGtkPrintLabel(streamLabel,    "Streamversion %d", info.stream_version);
             mpcGtkPrintLabel(encoderLabel,   "Encoder: \%s", info.encoder);
-            mpcGtkPrintLabel(profileLabel,   "Profile: \%s", info.profile_name);
+                        mpcGtkPrintLabel(profileLabel,   "Profile: \%s", info.profile_name);
+                        mpcGtkPrintLabel(pnsLabel,       "PNS: \%s", info.pns ? "on" : "off");
+                        mpcGtkPrintLabel(gaplessLabel,   "Gapless: \%s", info.is_true_gapless ? "on" : "off");
             mpcGtkPrintLabel(bitrateLabel,   "Average bitrate: \%6.1f kbps", info.average_bitrate * 1.e-3);
             mpcGtkPrintLabel(rateLabel,      "Samplerate: \%d Hz", info.sample_freq);
@@ -827 +831 @@
                         if (!mpcDecoder.isPause && status == 0 && MpcPlugin.output->output_time() == 0)
                                 break;
-            xmms_usleep(10000);
+            xmms_usleep(100000);
                 }
         }
@@ -837 +841 @@
 static int processBuffer(MPC_SAMPLE_FORMAT* sampleBuffer, char* xmmsBuffer, mpc_demux& demux)
 {
-    mpc_uint32_t vbrAcc = 0;
-    mpc_uint32_t vbrUpd = 0;
         mpc_frame_info info;
 
@@ -847 +849 @@
     if (pluginConfig.dynamicBitrate)
     {
-        track.bitrate = static_cast<int> (vbrUpd * track.sampleFreq / 1152);
+        track.bitrate = static_cast<int> (info.bits * track.sampleFreq / 1152);
     }