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

decoder/Control: add attribute configured_audio_format

Browse Source 
Obsoletes the same variable from AudioConfig.cxx.
This commit is contained in:
Max Kellermann
2016-12-03 14:12:08 +01:00
parent 3472208c05
commit 9fb7cc796b
13 changed files with 41 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/decoder/Bridge.cxx
View File

@@ -29,7 +29,6 @@
#include "MusicChunk.hxx"
#include "pcm/PcmConvert.hxx"
#include "tag/Tag.hxx"
#include "AudioConfig.hxx"
#include "Log.hxx"
#include "input/InputStream.hxx"
#include "util/ConstBuffer.hxx"
@@ -260,7 +259,8 @@ DecoderBridge::Ready(const AudioFormat audio_format,
assert(audio_format.IsValid());
dc.in_audio_format = audio_format;
dc.out_audio_format = getOutputAudioFormat(audio_format);
dc.out_audio_format = audio_format;
dc.out_audio_format.ApplyMask(dc.configured_audio_format);
dc.seekable = seekable;
dc.total_time = duration;

2
src/decoder/DecoderControl.cxx
View File

@@ -28,8 +28,10 @@
#include <assert.h>
DecoderControl::DecoderControl(Mutex &_mutex, Cond &_client_cond,
const AudioFormat _configured_audio_format,
const ReplayGainConfig &_replay_gain_config)
:mutex(_mutex), client_cond(_client_cond),
configured_audio_format(_configured_audio_format),
replay_gain_config(_replay_gain_config) {}
DecoderControl::~DecoderControl()

6
src/decoder/DecoderControl.hxx
View File

@@ -115,6 +115,11 @@ struct DecoderControl {
bool seekable;
SongTime seek_time;
/**
* The "audio_output_format" setting.
*/
const AudioFormat configured_audio_format;
/** the format of the song file */
AudioFormat in_audio_format;
@@ -171,6 +176,7 @@ struct DecoderControl {
* @param _client_cond see #client_cond
*/
DecoderControl(Mutex &_mutex, Cond &_client_cond,
const AudioFormat _configured_audio_format,
const ReplayGainConfig &_replay_gain_config);
~DecoderControl();