From d9ea3082fb608935c72620e272f4b3e74b2c3a44 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 30 Jan 2013 22:00:32 +0100 Subject: ConfigData: add constructors/destructors --- test/DumpDatabase.cxx | 9 ++++----- test/run_encoder.cxx | 7 +++---- test/test_vorbis_encoder.cxx | 6 +++--- 3 files changed, 10 insertions(+), 12 deletions(-) (limited to 'test') diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx index 501c8020..172d0049 100644 --- a/test/DumpDatabase.cxx +++ b/test/DumpDatabase.cxx @@ -106,13 +106,12 @@ main(int argc, char **argv) /* do it */ const struct config_param *path = config_get_param(CONF_DB_FILE); - struct config_param *param = config_new_param("database", path->line); + config_param param("database", path->line); if (path != nullptr) - config_add_block_param(param, "path", path->value, path->line); + config_add_block_param(¶m, "path", path->value, + path->line); - Database *db = plugin->create(param, &error); - - config_param_free(param); + Database *db = plugin->create(¶m, &error); if (db == nullptr) { cerr << error->message << endl; diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx index 3d500d0b..e2ecab58 100644 --- a/test/run_encoder.cxx +++ b/test/run_encoder.cxx @@ -49,7 +49,6 @@ int main(int argc, char **argv) const char *encoder_name; const struct encoder_plugin *plugin; struct encoder *encoder; - struct config_param *param; static char buffer[32768]; /* parse command line */ @@ -74,10 +73,10 @@ int main(int argc, char **argv) return 1; } - param = config_new_param(NULL, -1); - config_add_block_param(param, "quality", "5.0", -1); + config_param param; + config_add_block_param(¶m, "quality", "5.0", -1); - encoder = encoder_init(plugin, param, &error); + encoder = encoder_init(plugin, ¶m, &error); if (encoder == NULL) { g_printerr("Failed to initialize encoder: %s\n", error->message); diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx index 887fd1a7..aad48acd 100644 --- a/test/test_vorbis_encoder.cxx +++ b/test/test_vorbis_encoder.cxx @@ -53,10 +53,10 @@ main(G_GNUC_UNUSED int argc, G_GNUC_UNUSED char **argv) const struct encoder_plugin *plugin = encoder_plugin_get("vorbis"); assert(plugin != NULL); - struct config_param *param = config_new_param(NULL, -1); - config_add_block_param(param, "quality", "5.0", -1); + config_param param; + config_add_block_param(¶m, "quality", "5.0", -1); - struct encoder *encoder = encoder_init(plugin, param, NULL); + struct encoder *encoder = encoder_init(plugin, ¶m, NULL); assert(encoder != NULL); /* open the encoder */ -- cgit v1.2.3