diff options
| author | Max Kellermann <max@musicpd.org> | 2018-09-21 17:58:10 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-10-24 10:47:34 +0200 |
| commit | f7141c920121e9c6cef6582c89a73da74b814e2e (patch) | |
| tree | 1edb04858fd38c653908e9bbd51ad2e35c76073b /src | |
| parent | c2a2573aa5ed2d5e875c6b5f0cf84e7e940bbfa4 (diff) | |
decoder/Control: convert to class, make various attributes private
Diffstat (limited to 'src')
| -rw-r--r-- | src/decoder/Bridge.hxx | 2 | ||||
| -rw-r--r-- | src/decoder/Control.hxx | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/decoder/Bridge.hxx b/src/decoder/Bridge.hxx index 76ce9ab3a..8dc970604 100644 --- a/src/decoder/Bridge.hxx +++ b/src/decoder/Bridge.hxx @@ -29,7 +29,7 @@ class PcmConvert; struct MusicChunk; -struct DecoderControl; +class DecoderControl; struct Tag; /** diff --git a/src/decoder/Control.hxx b/src/decoder/Control.hxx index 6c1a7183e..5663e9f6f 100644 --- a/src/decoder/Control.hxx +++ b/src/decoder/Control.hxx @@ -61,12 +61,13 @@ enum class DecoderState : uint8_t { ERROR, }; -struct DecoderControl final : InputStreamHandler { +class DecoderControl final : public InputStreamHandler { /** * The handle of the decoder thread. */ Thread thread; +public: /** * This lock protects #state and #command. * @@ -103,8 +104,10 @@ struct DecoderControl final : InputStreamHandler { */ std::exception_ptr error; +private: bool quit; +public: /** * Is the client currently waiting for the DecoderThread? If * false, the DecoderThread may omit invoking Cond::signal(), @@ -116,11 +119,13 @@ struct DecoderControl final : InputStreamHandler { bool seekable; SongTime seek_time; +private: /** * The "audio_output_format" setting. */ const AudioFormat configured_audio_format; +public: /** the format of the song file */ AudioFormat in_audio_format; @@ -167,8 +172,10 @@ struct DecoderControl final : InputStreamHandler { float replay_gain_db = 0; float replay_gain_prev_db = 0; +private: MixRampInfo mix_ramp, previous_mix_ramp; +public: /** * @param _mutex see #mutex * @param _client_cond see #client_cond |