test/run_filter: use struct ConfigData
This commit is contained in:
@@ -19,7 +19,8 @@
|
||||
|
||||
#include "config.h"
|
||||
#include "config/Param.hxx"
|
||||
#include "config/Global.hxx"
|
||||
#include "config/Data.hxx"
|
||||
#include "config/File.hxx"
|
||||
#include "fs/Path.hxx"
|
||||
#include "AudioParser.hxx"
|
||||
#include "AudioFormat.hxx"
|
||||
@@ -50,10 +51,10 @@ mixer_set_volume(gcc_unused Mixer *mixer,
|
||||
}
|
||||
|
||||
static std::unique_ptr<PreparedFilter>
|
||||
load_filter(const char *name)
|
||||
LoadFilter(const ConfigData &config, const char *name)
|
||||
{
|
||||
const auto *param = config_find_block(ConfigBlockOption::AUDIO_FILTER,
|
||||
"name", name);
|
||||
const auto *param = config.FindBlock(ConfigBlockOption::AUDIO_FILTER,
|
||||
"name", name);
|
||||
if (param == NULL)
|
||||
throw FormatRuntimeError("No such configured filter: %s",
|
||||
name);
|
||||
@@ -76,8 +77,8 @@ try {
|
||||
|
||||
/* read configuration file (mpd.conf) */
|
||||
|
||||
config_global_init();
|
||||
ReadConfigFile(config_path);
|
||||
ConfigData config;
|
||||
ReadConfigFile(config, config_path);
|
||||
|
||||
/* parse the audio format */
|
||||
|
||||
@@ -86,7 +87,7 @@ try {
|
||||
|
||||
/* initialize the filter */
|
||||
|
||||
auto prepared_filter = load_filter(argv[2]);
|
||||
auto prepared_filter = LoadFilter(config, argv[2]);
|
||||
|
||||
/* open the filter */
|
||||
|
||||
@@ -118,8 +119,6 @@ try {
|
||||
|
||||
/* cleanup and exit */
|
||||
|
||||
config_global_finish();
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
} catch (...) {
|
||||
PrintException(std::current_exception());
|
||||
|
Reference in New Issue
Block a user