Mercurial > audlegacy-plugins

changeset 2711:183bd24000c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use InputPlayback structure properly.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 16 Jun 2008 07:11:18 +0300
parents 1756960988e5
children 5eef9a0818ab
files src/wavpack/libwavpack.cxx
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/wavpack/libwavpack.cxx	Mon Jun 16 06:20:03 2008 +0300
+++ b/src/wavpack/libwavpack.cxx	Mon Jun 16 07:11:18 2008 +0300
@@ -246,9 +246,9 @@
         return true;
     }
 
-    gboolean open_audio()
+    gboolean open_audio(InputPlayback *playback)
     {
-        return wvpack->output->open_audio(SAMPLE_FMT(bits_per_sample), sample_rate, num_channels);
+        return playback->output->open_audio(SAMPLE_FMT(bits_per_sample), sample_rate, num_channels);
     }
 
     void process_buffer(InputPlayback *playback, guint32 num_samples)
@@ -333,7 +333,7 @@
 
     AUDDBG("reading WavPack file, %dHz, %d channels and %dbits\n", d.sample_rate, d.num_channels, d.bits_per_sample);
 
-    if (!d.open_audio()) {
+    if (!d.open_audio(playback)) {
         AUDDBG("error opening audio channel\n");
         killDecodeThread = true;
         AudioError = true;
@@ -361,7 +361,7 @@
                 printf("wavpack: Error decoding file.\n");
                 break;
             }
-            else if (samples_left == 0 && wvpack.output->buffer_playing() == 0) {
+            else if (samples_left == 0 && playback->output->buffer_playing() == 0) {
                 killDecodeThread = true;
                 break;
             }
@@ -531,8 +531,8 @@
     if (thread_handle != 0) {
         g_thread_join(thread_handle);
         if (openedAudio) {
-            wvpack.output->buffer_free();
-            wvpack.output->close_audio();
+            data->output->buffer_free();
+            data->output->close_audio();
         }
         openedAudio = false;
         if (AudioError)