diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-19 18:18:32 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-19 18:18:32 +0200 |
| commit | c9d43b4d713d508b6f5b67cfffba9296f9436934 (patch) | |
| tree | 70100c28e365a244f5c6a361d2ecda332df2a756 /test | |
| parent | c5ec035fb4a533ebd9f8c69b085604560d2a5487 (diff) | |
| parent | 49ede85827c095d0a6ead0ecb63e83e000a76d4f (diff) | |
| download | mpd-c9d43b4d713d508b6f5b67cfffba9296f9436934.tar.gz mpd-c9d43b4d713d508b6f5b67cfffba9296f9436934.tar.xz mpd-c9d43b4d713d508b6f5b67cfffba9296f9436934.zip | |
Merge branch 'master' of git://git.infradead.org/users/dwmw2/mpd
Conflicts:
Makefile.am
Diffstat (limited to 'test')
| -rw-r--r-- | test/run_encoder.c | 8 | ||||
| -rw-r--r-- | test/run_filter.c | 8 | ||||
| -rw-r--r-- | test/run_output.c | 8 | ||||
| -rw-r--r-- | test/software_volume.c | 7 |
4 files changed, 11 insertions, 20 deletions
diff --git a/test/run_encoder.c b/test/run_encoder.c index 8cb1c6d1d..a9b00e95e 100644 --- a/test/run_encoder.c +++ b/test/run_encoder.c @@ -41,11 +41,7 @@ encoder_to_stdout(struct encoder *encoder) int main(int argc, char **argv) { GError *error = NULL; - struct audio_format audio_format = { - .sample_rate = 44100, - .bits = 16, - .channels = 2, - }; + struct audio_format audio_format; bool ret; const char *encoder_name; const struct encoder_plugin *plugin; @@ -66,6 +62,8 @@ int main(int argc, char **argv) else encoder_name = "vorbis"; + audio_format_init(&audio_format, 44100, 16, 2); + /* create the encoder */ plugin = encoder_plugin_get(encoder_name); diff --git a/test/run_filter.c b/test/run_filter.c index 0d97207e1..3c98491ab 100644 --- a/test/run_filter.c +++ b/test/run_filter.c @@ -70,11 +70,7 @@ load_filter(const char *name) int main(int argc, char **argv) { - struct audio_format audio_format = { - .sample_rate = 44100, - .bits = 16, - .channels = 2, - }; + struct audio_format audio_format; bool success; GError *error = NULL; struct filter *filter; @@ -87,6 +83,8 @@ int main(int argc, char **argv) return 1; } + audio_format_init(&audio_format, 44100, 16, 2); + g_thread_init(NULL); /* read configuration file (mpd.conf) */ diff --git a/test/run_output.c b/test/run_output.c index adf6e1dd9..a280f88d4 100644 --- a/test/run_output.c +++ b/test/run_output.c @@ -100,11 +100,7 @@ load_audio_output(struct audio_output *ao, const char *name) int main(int argc, char **argv) { struct audio_output ao; - struct audio_format audio_format = { - .sample_rate = 44100, - .bits = 16, - .channels = 2, - }; + struct audio_format audio_format; bool success; GError *error = NULL; char buffer[4096]; @@ -116,6 +112,8 @@ int main(int argc, char **argv) return 1; } + audio_format_init(&audio_format, 44100, 16, 2); + g_thread_init(NULL); /* read configuration file (mpd.conf) */ diff --git a/test/software_volume.c b/test/software_volume.c index 9a9fd56f6..9e8c8e7d0 100644 --- a/test/software_volume.c +++ b/test/software_volume.c @@ -35,11 +35,7 @@ int main(int argc, char **argv) { GError *error = NULL; - struct audio_format audio_format = { - .sample_rate = 48000, - .bits = 16, - .channels = 2, - }; + struct audio_format audio_format; bool ret; static char buffer[4096]; ssize_t nbytes; @@ -57,6 +53,7 @@ int main(int argc, char **argv) return 1; } } + audio_format_init(&audio_format, 48000, 16, 2); while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) { pcm_volume(buffer, nbytes, &audio_format, PCM_VOLUME_1 / 2); |