changeset 2001:aa8bd7b56cda

make wavpack compile again.
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Tue, 09 Oct 2007 05:08:54 +0900
parents 89a445c53318
children d7642cf63ae5
files src/wavpack/libwavpack.cxx src/wavpack/tags.cxx
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/wavpack/libwavpack.cxx	Tue Oct 09 04:56:47 2007 +0900
+++ b/src/wavpack/libwavpack.cxx	Tue Oct 09 05:08:54 2007 +0900
@@ -242,7 +242,7 @@
         num_channels = WavpackGetNumChannels(ctx);
         input = (int32_t *)calloc(BUFFER_SIZE, num_channels * sizeof(int32_t));
         output = (int16_t *)calloc(BUFFER_SIZE, num_channels * sizeof(int16_t));
-        playback->set_params(playback, generate_title(filename, ctx),
+        playback->set_params(playback, generate_title(playback->filename, ctx),
                       (int) (WavpackGetNumSamples(ctx) / sample_rate) * 1000,
                       (int) WavpackGetAverageBitrate(ctx, num_channels),
                       (int) sample_rate, num_channels);
@@ -257,7 +257,7 @@
     void process_buffer(InputPlayback *playback, size_t num_samples)
     {
         /* TODO: dithering */
-        for (int i = 0; i < num_samples * num_channels; i++)
+        for (unsigned int i = 0; i < num_samples * num_channels; i++)
             output[i] = input[i];
 
         playback->pass_audio(playback, FMT_S16_NE, 
--- a/src/wavpack/tags.cxx	Tue Oct 09 04:56:47 2007 +0900
+++ b/src/wavpack/tags.cxx	Tue Oct 09 05:08:54 2007 +0900
@@ -6,6 +6,7 @@
 #include <wchar.h>
 #include <audacious/util.h>
 #include <audacious/vfs.h>
+#include <audacious/plugin.h>
 #include "tags.h"
 
 struct APETagFooterStruct {