aboutsummaryrefslogtreecommitdiffstats
path: root/test/run_output.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-07-19 18:18:32 +0200
committerMax Kellermann <max@duempel.org>2009-07-19 18:18:32 +0200
commitc9d43b4d713d508b6f5b67cfffba9296f9436934 (patch)
tree70100c28e365a244f5c6a361d2ecda332df2a756 /test/run_output.c
parentc5ec035fb4a533ebd9f8c69b085604560d2a5487 (diff)
parent49ede85827c095d0a6ead0ecb63e83e000a76d4f (diff)
downloadmpd-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/run_output.c')
-rw-r--r--test/run_output.c8
1 files changed, 3 insertions, 5 deletions
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) */