diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-10 17:57:14 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-11-14 01:15:26 +0100 |
| commit | cef5dcc0a15759588fcfd079ec87592511e02df4 (patch) | |
| tree | ea594056a9f0b786a0fe55090d8c13a5b0e0bcff /test | |
| parent | e5b119a3243bf688879d601bce431d24227679c9 (diff) | |
| download | mpd-cef5dcc0a15759588fcfd079ec87592511e02df4.tar.gz mpd-cef5dcc0a15759588fcfd079ec87592511e02df4.tar.xz mpd-cef5dcc0a15759588fcfd079ec87592511e02df4.zip | |
audio_format: added function audio_format_to_string()
Unified function for converting an audio_format object to a string,
for log messages and for the "status" command.
Diffstat (limited to 'test')
| -rw-r--r-- | test/run_decoder.c | 6 | ||||
| -rw-r--r-- | test/run_filter.c | 6 | ||||
| -rw-r--r-- | test/run_output.c | 5 |
3 files changed, 10 insertions, 7 deletions
diff --git a/test/run_decoder.c b/test/run_decoder.c index 7e0c582a2..72e0783f0 100644 --- a/test/run_decoder.c +++ b/test/run_decoder.c @@ -63,11 +63,13 @@ decoder_initialized(struct decoder *decoder, G_GNUC_UNUSED bool seekable, G_GNUC_UNUSED float total_time) { + struct audio_format_string af_string; + assert(!decoder->initialized); assert(audio_format_valid(audio_format)); - g_printerr("audio_format=%u:%u:%u\n", audio_format->sample_rate, - audio_format->bits, audio_format->channels); + g_printerr("audio_format=%s\n", + audio_format_to_string(audio_format, &af_string)); decoder->initialized = true; } diff --git a/test/run_filter.c b/test/run_filter.c index de5f9a925..30495b1fd 100644 --- a/test/run_filter.c +++ b/test/run_filter.c @@ -72,6 +72,7 @@ load_filter(const char *name) int main(int argc, char **argv) { struct audio_format audio_format; + struct audio_format_string af_string; bool success; GError *error = NULL; struct filter *filter; @@ -127,9 +128,8 @@ int main(int argc, char **argv) return 1; } - - g_printerr("audio_format=%u:%u:%u\n", out_audio_format->sample_rate, - out_audio_format->bits, out_audio_format->channels); + g_printerr("audio_format=%s\n", + audio_format_to_string(out_audio_format, &af_string)); frame_size = audio_format_frame_size(&audio_format); diff --git a/test/run_output.c b/test/run_output.c index 36bff7721..1acc7b377 100644 --- a/test/run_output.c +++ b/test/run_output.c @@ -107,6 +107,7 @@ int main(int argc, char **argv) { struct audio_output ao; struct audio_format audio_format; + struct audio_format_string af_string; bool success; GError *error = NULL; char buffer[4096]; @@ -160,8 +161,8 @@ int main(int argc, char **argv) return 1; } - g_printerr("audio_format=%u:%u:%u\n", audio_format.sample_rate, - audio_format.bits, audio_format.channels); + g_printerr("audio_format=%s\n", + audio_format_to_string(&audio_format, &af_string)); frame_size = audio_format_frame_size(&audio_format); |