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

Merge branch 'v0.16.x'

Browse Source 
Conflicts:
	NEWS
	configure.ac
This commit is contained in:
Max Kellermann
2011-07-19 00:24:20 +02:00
parent e54748d355 736fd0e293
commit eb2f413cf0
17 changed files with 247 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/read_conf.c
View File

@@ -37,30 +37,28 @@ my_log_func(G_GNUC_UNUSED const gchar *log_domain,
int main(int argc, char **argv)
{
const char *path, *name, *value;
GError *error = NULL;
bool success;
int ret;
if (argc != 3) {
g_printerr("Usage: read_conf FILE SETTING\n");
return 1;
}
path = argv[1];
name = argv[2];
const char *path = argv[1];
const char *name = argv[2];
g_log_set_default_handler(my_log_func, NULL);
config_global_init();
success = config_read_file(path, &error);
GError *error = NULL;
bool success = config_read_file(path, &error);
if (!success) {
g_printerr("%s:", error->message);
g_error_free(error);
return 1;
}
value = config_get_string(name, NULL);
const char *value = config_get_string(name, NULL);
int ret;
if (value != NULL) {
g_print("%s\n", value);
ret = 0;
@@ -70,5 +68,5 @@ int main(int argc, char **argv)
}
config_global_finish();
return 0;
return ret;
}

3
test/run_filter.c
View File

@@ -106,7 +106,6 @@ int main(int argc, char **argv)
struct filter *filter;
const struct audio_format *out_audio_format;
char buffer[4096];
size_t frame_size;
if (argc < 3 || argc > 4) {
g_printerr("Usage: run_filter CONFIG NAME [FORMAT] <IN\n");
@@ -162,8 +161,6 @@ int main(int argc, char **argv)
g_printerr("audio_format=%s\n",
audio_format_to_string(out_audio_format, &af_string));
frame_size = audio_format_frame_size(&audio_format);
/* play */
while (true) {