Mercurial > audlegacy
changeset 2542:ef01234ae265 trunk
[svn] - ppc64 warning fixes for upsampling patch
| author | nenolod |
|---|---|
| date | Sat, 17 Feb 2007 02:36:11 -0800 |
| parents | c399c0979e09 |
| children | 535bc24a9eb1 |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/output.c |
| diffstat | 3 files changed, 24 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Feb 17 02:32:37 2007 -0800 +++ b/ChangeLog Sat Feb 17 02:36:11 2007 -0800 @@ -1,3 +1,16 @@ +2007-02-17 10:32:37 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [4092] + - put configdb back in libaudacious as the client library needs it + + trunk/src/audacious/Makefile | 1 + trunk/src/audacious/configdb.c | 193 ------------------------------------- + trunk/src/audacious/configdb.h | 198 -------------------------------------- + trunk/src/libaudacious/Makefile | 2 + trunk/src/libaudacious/configdb.c | 193 +++++++++++++++++++++++++++++++++++++ + trunk/src/libaudacious/configdb.h | 198 ++++++++++++++++++++++++++++++++++++++ + 6 files changed, 393 insertions(+), 392 deletions(-) + + 2007-02-17 10:30:32 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4090] - update options printout
--- a/src/audacious/build_stamp.c Sat Feb 17 02:32:37 2007 -0800 +++ b/src/audacious/build_stamp.c Sat Feb 17 02:36:11 2007 -0800 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070217-4090"; +const gchar *svn_stamp = "20070217-4092";
--- a/src/audacious/output.c Sat Feb 17 02:32:37 2007 -0800 +++ b/src/audacious/output.c Sat Feb 17 02:36:11 2007 -0800 @@ -33,6 +33,9 @@ #include "playlist.h" #include "libaudacious/configdb.h" + +#include <math.h> + #ifdef USE_SRC #include <samplerate.h> #endif @@ -414,9 +417,9 @@ #ifdef USE_SRC if(isSrcAlloc == TRUE) { - free(srcIn); - free(srcOut); - free(wOut); + g_free(srcIn); + g_free(srcOut); + g_free(wOut); isSrcAlloc = FALSE; } @@ -424,9 +427,9 @@ { int lrLength = length/2; int overLrLength = (int)floor(lrLength*(src_data.src_ratio+1)); - srcIn = (float*)malloc(sizeof(float)*lrLength); - srcOut = (float*)malloc(sizeof(float)*overLrLength); - wOut = (short int*)malloc(sizeof(short int)*overLrLength); + srcIn = (float*) g_malloc(sizeof(float)*lrLength); + srcOut = (float*) g_malloc(sizeof(float)*overLrLength); + wOut = (short int*) g_malloc(sizeof(short int)*overLrLength); src_short_to_float_array((short int*)ptr, srcIn, lrLength); isSrcAlloc = TRUE; src_data.data_in = srcIn; @@ -434,7 +437,7 @@ src_data.end_of_input = 0; src_data.input_frames = lrLength/2; src_data.output_frames = overLrLength/2; - if (srcError = src_process(src_state, &src_data)) + if ((srcError = src_process(src_state, &src_data)) > 0) { fprintf(stderr, "src_process(): %s\n", src_strerror(srcError)); }