diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-03 21:00:50 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-08-03 21:37:56 +0200 |
| commit | d1e7b4e38136f9342aad76c685a13adf0e69f869 (patch) | |
| tree | 49643b937ddfe735511b566a71398da5a945d7aa /src/AudioConfig.cxx | |
| parent | 67f591a9ce60651da41afc499bd9a22e25314e35 (diff) | |
| download | mpd-d1e7b4e38136f9342aad76c685a13adf0e69f869.tar.gz mpd-d1e7b4e38136f9342aad76c685a13adf0e69f869.tar.xz mpd-d1e7b4e38136f9342aad76c685a13adf0e69f869.zip | |
audio_format: convert to C++
Diffstat (limited to 'src/AudioConfig.cxx')
| -rw-r--r-- | src/AudioConfig.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/AudioConfig.cxx b/src/AudioConfig.cxx index e546aed27..9ead61afe 100644 --- a/src/AudioConfig.cxx +++ b/src/AudioConfig.cxx @@ -19,18 +19,19 @@ #include "config.h" #include "AudioConfig.hxx" -#include "audio_format.h" +#include "AudioFormat.hxx" #include "AudioParser.hxx" #include "conf.h" #include "mpd_error.h" -static struct audio_format configured_audio_format; +static AudioFormat configured_audio_format; -void getOutputAudioFormat(const struct audio_format *inAudioFormat, - struct audio_format *outAudioFormat) +AudioFormat +getOutputAudioFormat(AudioFormat inAudioFormat) { - *outAudioFormat = *inAudioFormat; - audio_format_mask_apply(outAudioFormat, &configured_audio_format); + AudioFormat out_audio_format = inAudioFormat; + out_audio_format.ApplyMask(configured_audio_format); + return out_audio_format; } void initAudioConfig(void) @@ -42,7 +43,7 @@ void initAudioConfig(void) if (param == NULL) return; - ret = audio_format_parse(&configured_audio_format, param->value, + ret = audio_format_parse(configured_audio_format, param->value, true, &error); if (!ret) MPD_ERROR("error parsing line %i: %s", |