diff options
| author | Max Kellermann <max@duempel.org> | 2013-08-03 21:00:50 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-08-03 21:37:56 +0200 |
| commit | d1e7b4e38136f9342aad76c685a13adf0e69f869 (patch) | |
| tree | 49643b937ddfe735511b566a71398da5a945d7aa /test/software_volume.cxx | |
| parent | 67f591a9ce60651da41afc499bd9a22e25314e35 (diff) | |
audio_format: convert to C++
Diffstat (limited to 'test/software_volume.cxx')
| -rw-r--r-- | test/software_volume.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/software_volume.cxx b/test/software_volume.cxx index fee4eeff3..c46804731 100644 --- a/test/software_volume.cxx +++ b/test/software_volume.cxx @@ -26,7 +26,7 @@ #include "config.h" #include "pcm/PcmVolume.hxx" #include "AudioParser.hxx" -#include "audio_format.h" +#include "AudioFormat.hxx" #include "stdbin.h" #include <glib.h> @@ -37,7 +37,6 @@ int main(int argc, char **argv) { GError *error = NULL; - struct audio_format audio_format; bool ret; static char buffer[4096]; ssize_t nbytes; @@ -47,20 +46,20 @@ int main(int argc, char **argv) return 1; } + AudioFormat audio_format(48000, SampleFormat::S16, 2); if (argc > 1) { - ret = audio_format_parse(&audio_format, argv[1], + ret = audio_format_parse(audio_format, argv[1], false, &error); if (!ret) { g_printerr("Failed to parse audio format: %s\n", error->message); return 1; } - } else - audio_format_init(&audio_format, 48000, SAMPLE_FORMAT_S16, 2); + } while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) { if (!pcm_volume(buffer, nbytes, - sample_format(audio_format.format), + audio_format.format, PCM_VOLUME_1 / 2)) { g_printerr("pcm_volume() has failed\n"); return 2; |