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

FilterPlugin: pass config_param reference

Browse Source
This commit is contained in:
Max Kellermann
2013-08-04 13:38:13 +02:00
parent ca0d09c50f
commit f54bcc1f16
14 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/filter/AutoConvertFilterPlugin.cxx
View File

@@ -24,6 +24,7 @@
#include "FilterInternal.hxx"
#include "FilterRegistry.hxx"
#include "AudioFormat.hxx"
#include "ConfigData.hxx"
#include <assert.h>
@@ -68,7 +69,8 @@ AutoConvertFilter::Open(AudioFormat &in_audio_format, GError **error_r)
if (in_audio_format != child_audio_format) {
/* yes - create a convert_filter */
convert = filter_new(&convert_filter_plugin, nullptr, error_r);
const config_param empty;
convert = filter_new(&convert_filter_plugin, empty, error_r);
if (convert == nullptr) {
filter->Close();
return AudioFormat::Undefined();

2
src/filter/ChainFilterPlugin.cxx
View File

@@ -73,7 +73,7 @@ filter_quark(void)
}
static Filter *
chain_filter_init(gcc_unused const struct config_param *param,
chain_filter_init(gcc_unused const config_param &param,
gcc_unused GError **error_r)
{
return new ChainFilter();

2
src/filter/ConvertFilterPlugin.cxx
View File

@@ -63,7 +63,7 @@ public:
};
static Filter *
convert_filter_init(gcc_unused const struct config_param *param,
convert_filter_init(gcc_unused const config_param &param,
gcc_unused GError **error_r)
{
return new ConvertFilter();

2
src/filter/NormalizeFilterPlugin.cxx
View File

@@ -41,7 +41,7 @@ public:
};
static Filter *
normalize_filter_init(gcc_unused const struct config_param *param,
normalize_filter_init(gcc_unused const config_param &param,
gcc_unused GError **error_r)
{
return new NormalizeFilter();

2
src/filter/NullFilterPlugin.cxx
View File

@@ -49,7 +49,7 @@ public:
};
static Filter *
null_filter_init(gcc_unused const struct config_param *param,
null_filter_init(gcc_unused const config_param &param,
gcc_unused GError **error_r)
{
return new NullFilter();

2
src/filter/ReplayGainFilterPlugin.cxx
View File

@@ -153,7 +153,7 @@ ReplayGainFilter::Update()
}
static Filter *
replay_gain_filter_init(gcc_unused const struct config_param *param,
replay_gain_filter_init(gcc_unused const config_param &param,
gcc_unused GError **error_r)
{
return new ReplayGainFilter();

13
src/filter/RouteFilterPlugin.cxx
View File

@@ -118,7 +118,7 @@ public:
* @param filter a route_filter whose min_channels and sources[] to set
* @return true on success, false on error
*/
bool Configure(const config_param *param, GError **error_r);
bool Configure(const config_param &param, GError **error_r);
virtual AudioFormat Open(AudioFormat &af, GError **error_r) override;
virtual void Close();
@@ -127,7 +127,7 @@ public:
};
bool
RouteFilter::Configure(const config_param *param, GError **error_r) {
RouteFilter::Configure(const config_param &param, GError **error_r) {
/* TODO:
* With a more clever way of marking "don't copy to output N",
@@ -139,8 +139,7 @@ RouteFilter::Configure(const config_param *param, GError **error_r) {
int number_of_copies;
// A cowardly default, just passthrough stereo
const char *routes =
config_get_block_string(param, "routes", "0>0, 1>1");
const char *const routes = param.GetBlockValue("routes", "0>0, 1>1");
min_input_channels = 0;
min_output_channels = 0;
@@ -163,7 +162,7 @@ RouteFilter::Configure(const config_param *param, GError **error_r) {
if (g_strv_length(sd) != 2) {
g_set_error(error_r, config_quark(), 1,
"Invalid copy around %d in routes spec: %s",
param->line, tokens[c]);
param.line, tokens[c]);
g_strfreev(sd);
g_strfreev(tokens);
return false;
@@ -210,7 +209,7 @@ RouteFilter::Configure(const config_param *param, GError **error_r) {
if (g_strv_length(sd) != 2) {
g_set_error(error_r, config_quark(), 1,
"Invalid copy around %d in routes spec: %s",
param->line, tokens[c]);
param.line, tokens[c]);
g_strfreev(sd);
g_strfreev(tokens);
return false;
@@ -230,7 +229,7 @@ RouteFilter::Configure(const config_param *param, GError **error_r) {
}
static Filter *
route_filter_init(const config_param *param, GError **error_r)
route_filter_init(const config_param &param, GError **error_r)
{
RouteFilter *filter = new RouteFilter();
if (!filter->Configure(param, error_r)) {

2
src/filter/VolumeFilterPlugin.cxx
View File

@@ -69,7 +69,7 @@ volume_quark(void)
}
static Filter *
volume_filter_init(gcc_unused const struct config_param *param,
volume_filter_init(gcc_unused const config_param &param,
gcc_unused GError **error_r)
{
return new VolumeFilter();