# HG changeset patch # User Eugene Zagidullin # Date 1203118687 -10800 # Node ID 19c4a20d11a127fb2d7ef7ec038cd3ff32616d21 # Parent af324ff0a9830a0b264694663291af9a7c3b8257 cleanup diff -r af324ff0a983 -r 19c4a20d11a1 src/audacious/output.c --- a/src/audacious/output.c Sat Feb 16 01:47:30 2008 +0300 +++ b/src/audacious/output.c Sat Feb 16 02:38:07 2008 +0300 @@ -316,7 +316,6 @@ output_open_audio(AFormat fmt, gint rate, gint nch) { gint ret; - /*OutputPlugin *op;*/ AUDDBG("requested: fmt=%d, rate=%d, nch=%d\n", fmt, rate, nch); AFormat output_fmt; @@ -402,42 +401,6 @@ return reopen_audio(fmt, rate, nch); } /* bypass_dsp */ - -#if 0 - op = get_current_output_plugin(); - - if (op == NULL) - return FALSE; - - /* 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)) - { - /* Yes, and it's the correct sampling rate. Reset the counter and go. */ - AUDDBG("flushing output instead of reopening\n"); - plugin_set_current((Plugin *)op); - op->flush(0); - return TRUE; - } - else if (op_state.rate != 0 && op_state.nch != 0) - { - plugin_set_current((Plugin *)op); - op->close_audio(); - } - - plugin_set_current((Plugin *)op); - ret = op->open_audio(fmt, rate, nch); - - if (ret == 1) /* Success? */ - { - AUDDBG("opened audio: fmt=%d, rate=%d, nch=%d\n", fmt, rate, nch); - op_state.fmt = fmt; - op_state.rate = rate; - op_state.nch = nch; - } - - return ret; -#endif } void