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

output/alsa: use C++ initializers

Browse Source
This commit is contained in:
Max Kellermann 2016-11-04 11:27:29 +01:00
parent 6341be9cdf
commit b35bb1b50c
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/output/plugins/AlsaOutputPlugin.cxx
View File

@ -59,7 +59,7 @@ struct AlsaOutput {
* The configured name of the ALSA device; empty for the * The configured name of the ALSA device; empty for the
* default device * default device
*/ */
std::string device; const std::string device;
#ifdef ENABLE_DSD #ifdef ENABLE_DSD
/** /**
@ -67,14 +67,14 @@ struct AlsaOutput {
* *
* @see http://dsd-guide.com/dop-open-standard * @see http://dsd-guide.com/dop-open-standard
*/ */
bool dop; const bool dop;
#endif #endif
/** libasound's buffer_time setting (in microseconds) */ /** libasound's buffer_time setting (in microseconds) */
unsigned int buffer_time; const unsigned buffer_time;
/** libasound's period_time setting (in microseconds) */ /** libasound's period_time setting (in microseconds) */
unsigned int period_time; const unsigned period_time;
/** the mode flags passed to snd_pcm_open */ /** the mode flags passed to snd_pcm_open */
int mode = 0; int mode = 0;
@ -167,20 +167,17 @@ private:
static constexpr Domain alsa_output_domain("alsa_output"); static constexpr Domain alsa_output_domain("alsa_output");
AlsaOutput::AlsaOutput(const ConfigBlock &block) AlsaOutput::AlsaOutput(const ConfigBlock &block)
:base(alsa_output_plugin, block) :base(alsa_output_plugin, block),
{ device(block.GetBlockValue("device", "")),
device = block.GetBlockValue("device", "");
#ifdef ENABLE_DSD #ifdef ENABLE_DSD
dop = block.GetBlockValue("dop", false) || dop(block.GetBlockValue("dop", false) ||
/* legacy name from MPD 0.18 and older: */ /* legacy name from MPD 0.18 and older: */
block.GetBlockValue("dsd_usb", false); block.GetBlockValue("dsd_usb", false)),
#endif #endif
buffer_time(block.GetBlockValue("buffer_time",
buffer_time = block.GetBlockValue("buffer_time", MPD_ALSA_BUFFER_TIME_US)),
MPD_ALSA_BUFFER_TIME_US); period_time(block.GetBlockValue("period_time", 0u))
period_time = block.GetBlockValue("period_time", 0u); {
#ifdef SND_PCM_NO_AUTO_RESAMPLE #ifdef SND_PCM_NO_AUTO_RESAMPLE
if (!block.GetBlockValue("auto_resample", true)) if (!block.GetBlockValue("auto_resample", true))
mode |= SND_PCM_NO_AUTO_RESAMPLE; mode |= SND_PCM_NO_AUTO_RESAMPLE;