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

ConfigFile, CommandLine: use the Path class

Browse Source
This commit is contained in:
Max Kellermann
2013-01-29 17:23:35 +01:00
parent eb8922f346
commit feb8d5b82f
12 changed files with 96 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/DumpDatabase.cxx
View File

@@ -26,6 +26,7 @@
#include "PlaylistVector.hxx"
#include "conf.h"
#include "tag.h"
#include "fs/Path.hxx"
#include <iostream>
using std::cout;
@@ -76,7 +77,7 @@ main(int argc, char **argv)
return 1;
}
const char *const config_path = argv[1];
const Path config_path = Path::FromFS(argv[1]);
const char *const plugin_name = argv[2];
const DatabasePlugin *plugin = GetDatabasePluginByName(plugin_name);
@@ -94,7 +95,7 @@ main(int argc, char **argv)
config_global_init();
if (!config_read_file(config_path, &error)) {
if (!ReadConfigFile(config_path, &error)) {
cerr << error->message << endl;
g_error_free(error);
return EXIT_FAILURE;

6
test/dump_playlist.cxx
View File

@@ -28,6 +28,7 @@
#include "IOThread.hxx"
#include "PlaylistRegistry.hxx"
#include "PlaylistPlugin.hxx"
#include "fs/Path.hxx"
extern "C" {
#include "decoder_list.h"
@@ -141,7 +142,6 @@ int main(int argc, char **argv)
{
const char *uri;
struct input_stream *is = NULL;
bool success;
GError *error = NULL;
struct playlist_provider *playlist;
struct song *song;
@@ -151,6 +151,7 @@ int main(int argc, char **argv)
return 1;
}
const Path config_path = Path::FromFS(argv[1]);
uri = argv[2];
/* initialize GLib */
@@ -161,8 +162,7 @@ int main(int argc, char **argv)
/* initialize MPD */
config_global_init();
success = config_read_file(argv[1], &error);
if (!success) {
if (!ReadConfigFile(config_path, &error)) {
g_printerr("%s\n", error->message);
g_error_free(error);
return 1;

6
test/read_conf.cxx
View File

@@ -19,6 +19,7 @@
#include "config.h"
#include "conf.h"
#include "fs/Path.hxx"
#include <glib.h>
@@ -42,7 +43,7 @@ int main(int argc, char **argv)
return 1;
}
const char *path = argv[1];
const Path config_path = Path::FromFS(argv[1]);
const char *name = argv[2];
g_log_set_default_handler(my_log_func, NULL);
@@ -50,8 +51,7 @@ int main(int argc, char **argv)
config_global_init();
GError *error = NULL;
bool success = config_read_file(path, &error);
if (!success) {
if (!ReadConfigFile(config_path, &error)) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;

6
test/run_filter.cxx
View File

@@ -19,6 +19,7 @@
#include "config.h"
#include "conf.h"
#include "fs/Path.hxx"
extern "C" {
#include "audio_parser.h"
@@ -107,6 +108,8 @@ int main(int argc, char **argv)
return 1;
}
const Path config_path = Path::FromFS(argv[1]);
audio_format_init(&audio_format, 44100, SAMPLE_FORMAT_S16, 2);
/* initialize GLib */
@@ -117,8 +120,7 @@ int main(int argc, char **argv)
/* read configuration file (mpd.conf) */
config_global_init();
success = config_read_file(argv[1], &error);
if (!success) {
if (!ReadConfigFile(config_path, &error)) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;

6
test/run_output.cxx
View File

@@ -25,6 +25,7 @@
#include "event/Loop.hxx"
#include "GlobalEvents.hxx"
#include "IOThread.hxx"
#include "fs/Path.hxx"
extern "C" {
#include "output_plugin.h"
@@ -201,6 +202,8 @@ int main(int argc, char **argv)
return 1;
}
const Path config_path = Path::FromFS(argv[1]);
audio_format_init(&audio_format, 44100, SAMPLE_FORMAT_S16, 2);
g_thread_init(NULL);
@@ -208,8 +211,7 @@ int main(int argc, char **argv)
/* read configuration file (mpd.conf) */
config_global_init();
success = config_read_file(argv[1], &error);
if (!success) {
if (!ReadConfigFile(config_path, &error)) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;