Filter/Plugin: migrate from class Error to C++ exceptions

This commit is contained in:
Max Kellermann
2016-09-04 20:07:05 +02:00
parent 13c32111a0
commit 1c07f197de
13 changed files with 72 additions and 135 deletions

View File

@@ -93,8 +93,7 @@ public:
};
static PreparedFilter *
chain_filter_init(gcc_unused const ConfigBlock &block,
gcc_unused Error &error)
chain_filter_init(gcc_unused const ConfigBlock &block)
{
return new PreparedChainFilter();
}

View File

@@ -64,8 +64,7 @@ public:
};
static PreparedFilter *
convert_filter_init(gcc_unused const ConfigBlock &block,
gcc_unused Error &error)
convert_filter_init(gcc_unused const ConfigBlock &block)
{
return new PreparedConvertFilter();
}

View File

@@ -53,8 +53,7 @@ public:
};
static PreparedFilter *
normalize_filter_init(gcc_unused const ConfigBlock &block,
gcc_unused Error &error)
normalize_filter_init(gcc_unused const ConfigBlock &block)
{
return new PreparedNormalizeFilter();
}

View File

@@ -49,8 +49,7 @@ public:
};
static PreparedFilter *
null_filter_init(gcc_unused const ConfigBlock &block,
gcc_unused Error &error)
null_filter_init(gcc_unused const ConfigBlock &block)
{
return new PreparedNullFilter();
}

View File

@@ -168,8 +168,7 @@ ReplayGainFilter::Update()
}
static PreparedFilter *
replay_gain_filter_init(gcc_unused const ConfigBlock &block,
gcc_unused Error &error)
replay_gain_filter_init(gcc_unused const ConfigBlock &block)
{
return new PreparedReplayGainFilter();
}

View File

@@ -49,7 +49,7 @@
#include "pcm/PcmBuffer.hxx"
#include "pcm/Silence.hxx"
#include "util/StringUtil.hxx"
#include "util/Error.hxx"
#include "util/RuntimeError.hxx"
#include "util/ConstBuffer.hxx"
#include "util/WritableBuffer.hxx"
@@ -130,16 +130,14 @@ public:
* and input channel a gets copied to output channel b, etc.
* @param block the configuration block to read
* @param filter a route_filter whose min_channels and sources[] to set
* @return true on success, false on error
*/
bool Configure(const ConfigBlock &block, Error &error);
PreparedRouteFilter(const ConfigBlock &block);
/* virtual methods from class PreparedFilter */
Filter *Open(AudioFormat &af) override;
};
bool
PreparedRouteFilter::Configure(const ConfigBlock &block, Error &error)
PreparedRouteFilter::PreparedRouteFilter(const ConfigBlock &block)
{
/* TODO:
* With a more clever way of marking "don't copy to output N",
@@ -160,18 +158,12 @@ PreparedRouteFilter::Configure(const ConfigBlock &block, Error &error)
char *endptr;
const unsigned source = strtoul(routes, &endptr, 10);
endptr = StripLeft(endptr);
if (endptr == routes || *endptr != '>') {
error.Set(config_domain,
"Malformed 'routes' specification");
return false;
}
if (endptr == routes || *endptr != '>')
throw std::runtime_error("Malformed 'routes' specification");
if (source >= MAX_CHANNELS) {
error.Format(config_domain,
"Invalid source channel number: %u",
source);
return false;
}
if (source >= MAX_CHANNELS)
throw FormatRuntimeError("Invalid source channel number: %u",
source);
if (source >= min_input_channels)
min_input_channels = source + 1;
@@ -180,18 +172,12 @@ PreparedRouteFilter::Configure(const ConfigBlock &block, Error &error)
unsigned dest = strtoul(routes, &endptr, 10);
endptr = StripLeft(endptr);
if (endptr == routes) {
error.Set(config_domain,
"Malformed 'routes' specification");
return false;
}
if (endptr == routes)
throw std::runtime_error("Malformed 'routes' specification");
if (dest >= MAX_CHANNELS) {
error.Format(config_domain,
"Invalid destination channel number: %u",
dest);
return false;
}
if (dest >= MAX_CHANNELS)
throw FormatRuntimeError("Invalid destination channel number: %u",
dest);
if (dest >= min_output_channels)
min_output_channels = dest + 1;
@@ -203,28 +189,17 @@ PreparedRouteFilter::Configure(const ConfigBlock &block, Error &error)
if (*routes == 0)
break;
if (*routes != ',') {
error.Set(config_domain,
"Malformed 'routes' specification");
return false;
}
if (*routes != ',')
throw std::runtime_error("Malformed 'routes' specification");
++routes;
}
return true;
}
static PreparedFilter *
route_filter_init(const ConfigBlock &block, Error &error)
route_filter_init(const ConfigBlock &block)
{
auto *filter = new PreparedRouteFilter();
if (!filter->Configure(block, error)) {
delete filter;
return nullptr;
}
return filter;
return new PreparedRouteFilter(block);
}
RouteFilter::RouteFilter(const AudioFormat &audio_format,

View File

@@ -61,8 +61,7 @@ public:
};
static PreparedFilter *
volume_filter_init(gcc_unused const ConfigBlock &block,
gcc_unused Error &error)
volume_filter_init(gcc_unused const ConfigBlock &block)
{
return new PreparedVolumeFilter();
}