From 3b3c9334c8216b09a967944e19f604a4acc5ccc3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 4 Feb 2013 11:08:32 +0100 Subject: decoder/Opus: replace non-static data member initializers Would require gcc 4.7, and MPD attempts to be compatible with gcc 4.6. --- src/decoder/OpusDecoderPlugin.cxx | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx index 8be95ab2..3e3a1e4e 100644 --- a/src/decoder/OpusDecoderPlugin.cxx +++ b/src/decoder/OpusDecoderPlugin.cxx @@ -70,12 +70,12 @@ class MPDOpusDecoder { ogg_stream_state os; - OpusDecoder *opus_decoder = nullptr; - opus_int16 *output_buffer = nullptr; - unsigned output_size = 0; + OpusDecoder *opus_decoder; + opus_int16 *output_buffer; + unsigned output_size; - bool os_initialized = false; - bool found_opus = false; + bool os_initialized; + bool found_opus; int opus_serialno; @@ -84,7 +84,10 @@ class MPDOpusDecoder { public: MPDOpusDecoder(struct decoder *_decoder, struct input_stream *_input_stream) - :decoder(_decoder), input_stream(_input_stream) {} + :decoder(_decoder), input_stream(_input_stream), + opus_decoder(nullptr), + output_buffer(nullptr), output_size(0), + os_initialized(false), found_opus(false) {} ~MPDOpusDecoder(); bool ReadFirstPage(OggSyncState &oy); -- cgit v1.2.3