Mercurial > audlegacy
changeset 2813:49f3d1b43518 trunk
[svn] - code cleanups involving SRC patch and indentation
| author | nenolod |
|---|---|
| date | Mon, 28 May 2007 03:25:22 -0700 |
| parents | 5bd949bbd1c7 |
| children | 77a012c3b521 |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/output.c |
| diffstat | 3 files changed, 18 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon May 28 03:16:56 2007 -0700 +++ b/ChangeLog Mon May 28 03:25:22 2007 -0700 @@ -1,3 +1,11 @@ +2007-05-28 10:16:56 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [4650] + - remove xmms-like plugin loader + + trunk/src/audacious/pluginenum.c | 14 -------------- + 1 file changed, 14 deletions(-) + + 2007-05-27 21:31:34 +0000 Ralf Ertzinger <ralf@skytale.net> revision [4648] Move effect plugin handling into the main thread
--- a/src/audacious/build_stamp.c Mon May 28 03:16:56 2007 -0700 +++ b/src/audacious/build_stamp.c Mon May 28 03:25:22 2007 -0700 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070527-4648"; +const gchar *svn_stamp = "20070528-4650";
--- a/src/audacious/output.c Mon May 28 03:16:56 2007 -0700 +++ b/src/audacious/output.c Mon May 28 03:25:22 2007 -0700 @@ -192,8 +192,8 @@ for (i = 0; i < 10; ++i) { - set_gain(i, 0, 0.03 * bands[i] + 0.000999999 * bands[i] * bands[i]); - set_gain(i, 1, 0.03 * bands[i] + 0.000999999 * bands[i] * bands[i]); + set_gain(i, 0, 0.03 * bands[i] + 0.000999999 * bands[i] * bands[i]); + set_gain(i, 1, 0.03 * bands[i] + 0.000999999 * bands[i] * bands[i]); } } @@ -227,6 +227,7 @@ } #ifdef USE_SRC + static SRC_STATE *src_state; static SRC_DATA src_data; static int overSamplingFs = 96000; @@ -251,6 +252,7 @@ lengthOfSrcIn = 0; lengthOfSrcOut = 0; } + #endif gint @@ -308,14 +310,14 @@ /* Is our output port already open? */ if ((op_state.rate != 0 && op_state.nch != 0) && - (op_state.rate == rate && op_state.nch == nch && op_state.fmt == fmt)) + (op_state.rate == rate && op_state.nch == nch && op_state.fmt == fmt)) { - /* Yes, and it's the correct sampling rate. Reset the counter and go. */ - op->flush(0); + /* Yes, and it's the correct sampling rate. Reset the counter and go. */ + op->flush(0); return 1; } else if (op_state.rate != 0 && op_state.nch != 0) - op->close_audio(); + op->close_audio(); ret = op->open_audio(fmt, rate, nch); @@ -530,7 +532,7 @@ if (writable > 2048) writable = 2048; - if (writable == 0) + if (writable == 0) return; while (op->buffer_free() < writable) { /* wait output buf */