diff options
| author | Max Kellermann <max@duempel.org> | 2013-02-04 11:08:32 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-02-04 11:08:32 +0100 |
| commit | 3b3c9334c8216b09a967944e19f604a4acc5ccc3 (patch) | |
| tree | 03fdb22d50b0f0b2f1f026e201306f0f7c5c9e3a /src | |
| parent | a4223aac38a4c576d30be1b882fc340dfa8d68d6 (diff) | |
| download | mpd-3b3c9334c8216b09a967944e19f604a4acc5ccc3.tar.gz mpd-3b3c9334c8216b09a967944e19f604a4acc5ccc3.tar.xz mpd-3b3c9334c8216b09a967944e19f604a4acc5ccc3.zip | |
decoder/Opus: replace non-static data member initializers
Would require gcc 4.7, and MPD attempts to be compatible with gcc 4.6.
Diffstat (limited to 'src')
| -rw-r--r-- | src/decoder/OpusDecoderPlugin.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx index 8be95ab2e..3e3a1e4e7 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); |