diff src/musepack/libmpc.cxx @ 1986:4b78df9dcf93

more set_params()
author William Pitcock <nenolod@atheme.org>
date Sun, 07 Oct 2007 14:34:40 -0500
parents fa9f85cebade
children 8f3188746b64
line wrap: on
line diff
--- a/src/musepack/libmpc.cxx	Sun Oct 07 14:26:26 2007 -0500
+++ b/src/musepack/libmpc.cxx	Sun Oct 07 14:34:40 2007 -0500
@@ -307,7 +307,7 @@
     mpcDecoder.isPause  = false;
     threadHandle = g_thread_self();
     data->set_pb_ready(data);
-    decodeStream((void *) g_strdup(data->filename));
+    decodeStream(data);
 }
 
 static void mpcStop(InputPlayback *data)
@@ -771,10 +771,10 @@
     return 0;
 }
 
-static void* decodeStream(void* data)
+static void* decodeStream(InputPlayback *data)
 {
     lockAcquire();
-    char* filename = static_cast<char*> (data);
+    char* filename = data->filename;
     VFSFile *input = aud_vfs_fopen(filename, "rb");
     if (!input)
     {
@@ -800,7 +800,7 @@
     track.channels   = info.channels;
     freeTags(tags);
 
-    MpcPlugin.set_info(track.display, track.length, track.bitrate, track.sampleFreq, track.channels);
+    data->set_params(data, track.display, track.length, track.bitrate, track.sampleFreq, track.channels);
 
     mpc_decoder decoder;
     mpc_decoder_setup(&decoder, &reader.reader);
@@ -857,7 +857,7 @@
                 counter -= status;
                 if(counter < 0)
                 {
-                    MpcPlugin.set_info(track.display, track.length, track.bitrate, track.sampleFreq, track.channels);
+                    data->set_params(data, track.display, track.length, track.bitrate, track.sampleFreq, track.channels);
                     counter = 2 * track.sampleFreq / 3;
                 }
             }