From 8cbdc2667e6f4f3713c329ae21aa3d8ae73fab24 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 8 Nov 2008 13:33:44 +0100 Subject: decoder: removed "plugin" from the decoder struct decoder.plugin was a write-only attribute. --- src/decoder_internal.h | 2 -- src/decoder_thread.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/src/decoder_internal.h b/src/decoder_internal.h index 9d3d6abea..39d6fe8a7 100644 --- a/src/decoder_internal.h +++ b/src/decoder_internal.h @@ -23,8 +23,6 @@ #include "pcm_utils.h" struct decoder { - const struct decoder_plugin *plugin; - struct pcm_convert_state conv_state; bool seeking; diff --git a/src/decoder_thread.c b/src/decoder_thread.c index a468f1069..7c870d6e7 100644 --- a/src/decoder_thread.c +++ b/src/decoder_thread.c @@ -123,7 +123,6 @@ static void decoder_run(void) continue; if (!decoder_try_decode(plugin, &input_stream)) continue; - decoder.plugin = plugin; ret = plugin->stream_decode(&decoder, &input_stream); break; @@ -136,7 +135,6 @@ static void decoder_run(void) /* we already know our mp3Plugin supports streams, no * need to check for stream{Types,DecodeFunc} */ if ((plugin = decoder_plugin_from_name("mp3"))) { - decoder.plugin = plugin; ret = plugin->stream_decode(&decoder, &input_stream); } @@ -151,11 +149,9 @@ static void decoder_run(void) if (plugin->file_decode != NULL) { input_stream_close(&input_stream); close_instream = false; - decoder.plugin = plugin; ret = plugin->file_decode(&decoder, uri); break; } else if (plugin->stream_decode != NULL) { - decoder.plugin = plugin; ret = plugin->stream_decode(&decoder, &input_stream); break; -- cgit v1.2.3