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

config/Block: add method GetPositiveValue()

Browse Source 
Adds missing checks to several plugins.
This commit is contained in:
Max Kellermann
2018-01-02 17:22:25 +01:00
parent 7c5306a841
commit be65c7d5d0
10 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/decoder/plugins/AdPlugDecoderPlugin.cxx
View File

@@ -42,7 +42,7 @@ adplug_init(const ConfigBlock &block)
FormatDebug(adplug_domain, "adplug %s",
CAdPlug::get_version().c_str());
sample_rate = block.GetBlockValue("sample_rate", 48000u);
sample_rate = block.GetPositiveValue("sample_rate", 48000u);
CheckSampleRate(sample_rate);
return true;

2
src/decoder/plugins/FluidsynthDecoderPlugin.cxx
View File

@@ -74,7 +74,7 @@ fluidsynth_mpd_log_function(int level, char *message, gcc_unused void *data)
static bool
fluidsynth_init(const ConfigBlock &block)
{
sample_rate = block.GetBlockValue("sample_rate", 48000u);
sample_rate = block.GetPositiveValue("sample_rate", 48000u);
CheckSampleRate(sample_rate);
soundfont_path = block.GetBlockValue("soundfont",

2
src/decoder/plugins/MikmodDecoderPlugin.cxx
View File

@@ -114,7 +114,7 @@ mikmod_decoder_init(const ConfigBlock &block)
static char params[] = "";
mikmod_loop = block.GetBlockValue("loop", false);
mikmod_sample_rate = block.GetBlockValue("sample_rate", 44100u);
mikmod_sample_rate = block.GetPositiveValue("sample_rate", 44100u);
if (!audio_valid_sample_rate(mikmod_sample_rate))
throw FormatRuntimeError("Invalid sample rate in line %d: %u",
block.line, mikmod_sample_rate);

2
src/decoder/plugins/SidplayDecoderPlugin.cxx
View File

@@ -93,7 +93,7 @@ sidplay_init(const ConfigBlock &block)
if (!database_path.IsNull())
songlength_database = sidplay_load_songlength_db(database_path);
default_songlength = block.GetBlockValue("default_songlength", 0u);
default_songlength = block.GetPositiveValue("default_songlength", 0u);
all_files_are_containers =
block.GetBlockValue("all_files_are_containers", true);