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

output/oss: make the static arrays "constexpr"

Browse Source
This commit is contained in:
Max Kellermann 2014-12-09 22:02:18 +01:00
parent b70df57f7b
commit a588aef921
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/plugins/OssOutputPlugin.cxx
View File

@ -124,7 +124,7 @@ oss_stat_device(const char *device, int *errno_r)
return OSS_STAT_NO_ERROR; return OSS_STAT_NO_ERROR;
} }
static const char *default_devices[] = { "/dev/sound/dsp", "/dev/dsp" }; static const char *const default_devices[] = { "/dev/sound/dsp", "/dev/dsp" };
static bool static bool
oss_output_test_default_device(void) oss_output_test_default_device(void)
@ -380,7 +380,7 @@ oss_setup_sample_rate(int fd, AudioFormat &audio_format,
break; break;
} }
static const int sample_rates[] = { 48000, 44100, 0 }; static constexpr int sample_rates[] = { 48000, 44100, 0 };
for (unsigned i = 0; sample_rates[i] != 0; ++i) { for (unsigned i = 0; sample_rates[i] != 0; ++i) {
sample_rate = sample_rates[i]; sample_rate = sample_rates[i];
if (sample_rate == (int)audio_format.sample_rate) if (sample_rate == (int)audio_format.sample_rate)
@ -572,7 +572,7 @@ oss_setup_sample_format(int fd, AudioFormat &audio_format,
/* the requested sample format is not available - probe for /* the requested sample format is not available - probe for
other formats supported by MPD */ other formats supported by MPD */
static const SampleFormat sample_formats[] = { static constexpr SampleFormat sample_formats[] = {
SampleFormat::S24_P32, SampleFormat::S24_P32,
SampleFormat::S32, SampleFormat::S32,
SampleFormat::S16, SampleFormat::S16,