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

test/ConfigGlue: merge duplicate code from various debug programs

Browse Source
This commit is contained in:
Max Kellermann
2019-02-05 21:56:20 +01:00
parent 848f6aa5ab
commit b0739eca87
9 changed files with 78 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/RunChromaprint.cxx
View File

@@ -17,9 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config/File.hxx"
#include "config/Migrate.hxx"
#include "config/Data.hxx"
#include "ConfigGlue.hxx"
#include "tag/Chromaprint.hxx"
#include "pcm/PcmConvert.hxx"
#include "event/Thread.hxx"
@@ -90,18 +88,13 @@ ParseCommandLine(int argc, char **argv)
}
class GlobalInit {
ConfigData config;
const ConfigData config;
EventThread io_thread;
public:
GlobalInit(Path config_path, bool verbose) {
SetLogThreshold(verbose ? LogLevel::DEBUG : LogLevel::INFO);
if (!config_path.IsNull()) {
ReadConfigFile(config, config_path);
Migrate(config);
}
explicit GlobalInit(Path config_path)
:config(AutoLoadConfigFile(config_path))
{
io_thread.Start();
input_stream_global_init(config,
@@ -245,7 +238,8 @@ int main(int argc, char **argv)
try {
const auto c = ParseCommandLine(argc, argv);
const GlobalInit init(c.config_path, c.verbose);
SetLogThreshold(c.verbose ? LogLevel::DEBUG : LogLevel::INFO);
const GlobalInit init(c.config_path);
const DecoderPlugin *plugin = decoder_plugin_from_name(c.decoder);
if (plugin == nullptr) {