oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/Control: convert to class, make various attributes private

Browse Source
This commit is contained in:
Max Kellermann 2018-09-21 17:58:10 +02:00
parent c2a2573aa5
commit f7141c9201
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoder/Bridge.hxx
View File

@ -29,7 +29,7 @@
class PcmConvert; class PcmConvert;
struct MusicChunk; struct MusicChunk;
struct DecoderControl; class DecoderControl;
struct Tag; struct Tag;
/** /**

9
src/decoder/Control.hxx
View File

@ -61,12 +61,13 @@ enum class DecoderState : uint8_t {
ERROR, ERROR,
}; };
struct DecoderControl final : InputStreamHandler { class DecoderControl final : public InputStreamHandler {
/** /**
* The handle of the decoder thread. * The handle of the decoder thread.
*/ */
Thread thread; Thread thread;
public:
/** /**
* This lock protects #state and #command. * This lock protects #state and #command.
* *
@ -103,8 +104,10 @@ struct DecoderControl final : InputStreamHandler {
*/ */
std::exception_ptr error; std::exception_ptr error;
private:
bool quit; bool quit;
public:
/** /**
* Is the client currently waiting for the DecoderThread? If * Is the client currently waiting for the DecoderThread? If
* false, the DecoderThread may omit invoking Cond::signal(), * false, the DecoderThread may omit invoking Cond::signal(),
@ -116,11 +119,13 @@ struct DecoderControl final : InputStreamHandler {
bool seekable; bool seekable;
SongTime seek_time; SongTime seek_time;
private:
/** /**
* The "audio_output_format" setting. * The "audio_output_format" setting.
*/ */
const AudioFormat configured_audio_format; const AudioFormat configured_audio_format;
public:
/** the format of the song file */ /** the format of the song file */
AudioFormat in_audio_format; AudioFormat in_audio_format;
@ -167,8 +172,10 @@ struct DecoderControl final : InputStreamHandler {
float replay_gain_db = 0; float replay_gain_db = 0;
float replay_gain_prev_db = 0; float replay_gain_prev_db = 0;
private:
MixRampInfo mix_ramp, previous_mix_ramp; MixRampInfo mix_ramp, previous_mix_ramp;
public:
/** /**
* @param _mutex see #mutex * @param _mutex see #mutex
* @param _client_cond see #client_cond * @param _client_cond see #client_cond