Mercurial > audlegacy-plugins
changeset 2709:04249b58c738
Remove references to output plugin field in InputPlugins (hopefully I didn't
miss any.)
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Mon, 16 Jun 2008 05:48:57 +0300 |
| parents | 0a0d4b96008d |
| children | 1756960988e5 |
| files | src/adplug/adplug-xmms.cc src/console/Audacious_Driver.cxx src/cue/cuesheet.c src/flacng/plugin.c src/modplug/plugin.cxx src/musepack/libmpc.cxx src/wavpack/libwavpack.cxx |
| diffstat | 7 files changed, 8 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/adplug/adplug-xmms.cc Mon Jun 16 02:28:11 2008 +0300 +++ b/src/adplug/adplug-xmms.cc Mon Jun 16 05:48:57 2008 +0300 @@ -1156,7 +1156,6 @@ NULL, // set_info_text (filled by XMMS) adplug_song_info, adplug_info_box, - NULL, // output plugin (filled by XMMS) adplug_get_tuple, adplug_is_our_fd, (gchar **)fmts,
--- a/src/console/Audacious_Driver.cxx Mon Jun 16 02:28:11 2008 +0300 +++ b/src/console/Audacious_Driver.cxx Mon Jun 16 05:48:57 2008 +0300 @@ -480,7 +480,6 @@ NULL, NULL, NULL, - NULL, get_song_tuple, NULL, (gchar **)gme_fmts,
--- a/src/cue/cuesheet.c Mon Jun 16 02:28:11 2008 +0300 +++ b/src/cue/cuesheet.c Mon Jun 16 05:48:57 2008 +0300 @@ -323,7 +323,6 @@ if (real_ip != NULL) { real_ip->plugin->set_info = cue_ip.set_info; - real_ip->plugin->output = NULL; g_free(real_ip); real_ip = NULL; } @@ -438,7 +437,6 @@ real_ip = (InputPlayback *)g_memdup(data, sizeof(InputPlayback)); real_ip->plugin = real_ip_plugin; real_ip->plugin->set_info = set_info_override; - real_ip->plugin->output = cue_ip.output; real_ip->filename = cue_file; data->playing = 1;
--- a/src/flacng/plugin.c Mon Jun 16 02:28:11 2008 +0300 +++ b/src/flacng/plugin.c Mon Jun 16 05:48:57 2008 +0300 @@ -446,7 +446,7 @@ /* * Flush the buffers */ - flac_ip.output->flush(seek_to); + playback->output->flush(seek_to); } seek_to = -1; } @@ -462,7 +462,7 @@ _DEBUG("End of stream reached, draining output buffer"); - while((-1 == seek_to) && flac_ip.output->buffer_playing() && playback->playing == TRUE) { + while((-1 == seek_to) && playback->output->buffer_playing() && playback->playing == TRUE) { g_usleep(40000); } @@ -478,7 +478,7 @@ */ playback->playing = FALSE; _DEBUG("Closing audio device"); - flac_ip.output->close_audio(); + playback->output->close_audio(); _DEBUG("Audio device closed"); free(play_buffer);
--- a/src/modplug/plugin.cxx Mon Jun 16 02:28:11 2008 +0300 +++ b/src/modplug/plugin.cxx Mon Jun 16 05:48:57 2008 +0300 @@ -116,7 +116,6 @@ NULL, NULL, ShowFileInfoBox, - NULL, // output GetSongTuple, CanPlayFileFromVFS, // vfs (gchar **)fmts,
--- a/src/musepack/libmpc.cxx Mon Jun 16 02:28:11 2008 +0300 +++ b/src/musepack/libmpc.cxx Mon Jun 16 05:48:57 2008 +0300 @@ -35,7 +35,6 @@ NULL, //set Info Text set_info_text(char* text) mpcGetSongInfo, //Get Title String callback [CALLBACK] mpcFileInfoBox, //Show File Info Box [CALLBACK] - NULL, //Output Plugin Handle OutputPlugin output mpcGetSongTuple,//Acquire tuple for song [CALLBACK] mpcIsOurFD, (gchar **)mpc_fmts @@ -51,7 +50,7 @@ static TrackInfo track = {0}; static GThread *threadHandle; -GStaticMutex threadMutex = G_STATIC_MUTEX_INIT; +static GStaticMutex threadMutex = G_STATIC_MUTEX_INIT; /* * VFS callback implementation, adapted from mpc_reader.c. @@ -812,7 +811,7 @@ MPC_SAMPLE_FORMAT sampleBuffer[MPC_DECODER_BUFFER_LENGTH]; char xmmsBuffer[MPC_DECODER_BUFFER_LENGTH * 4]; - if (!MpcPlugin.output->open_audio(FMT_S16_LE, track.sampleFreq, track.channels)) + if (!data->output->open_audio(FMT_S16_LE, track.sampleFreq, track.channels)) { mpcDecoder.isError = g_strdup_printf("[xmms-musepack] decodeStream is unable to open an audio output"); return endThread(filename, input, true); @@ -834,9 +833,9 @@ } lockAcquire(); - short iPlaying = MpcPlugin.output->buffer_playing()? 1 : 0; - gint iFree = MpcPlugin.output->buffer_free(); - if (!mpcDecoder.isPause && iFree >= ((1152 * 4) << iPlaying)) + short iPlaying = data->output->buffer_playing()? 1 : 0; + gint iFree = data->output->buffer_free(); + if (!mpcDecoder.isPause && iFree >= ((1152 * 4) << iPlaying)) { unsigned status = processBuffer(data, sampleBuffer, xmmsBuffer, decoder); if (status == (unsigned) (-1))