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

audio_format: convert to C++

Browse Source
This commit is contained in:
Max Kellermann
2013-08-03 21:00:50 +02:00
parent 67f591a9ce
commit d1e7b4e381
121 changed files with 1251 additions and 1275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/run_encoder.cxx
View File

@@ -20,7 +20,7 @@
#include "config.h"
#include "EncoderList.hxx"
#include "EncoderPlugin.hxx"
#include "audio_format.h"
#include "AudioFormat.hxx"
#include "AudioParser.hxx"
#include "conf.h"
#include "stdbin.h"
@@ -44,7 +44,6 @@ encoder_to_stdout(Encoder &encoder)
int main(int argc, char **argv)
{
GError *error = NULL;
struct audio_format audio_format;
bool ret;
const char *encoder_name;
static char buffer[32768];
@@ -61,8 +60,6 @@ int main(int argc, char **argv)
else
encoder_name = "vorbis";
audio_format_init(&audio_format, 44100, SAMPLE_FORMAT_S16, 2);
/* create the encoder */
const auto plugin = encoder_plugin_get(encoder_name);
@@ -84,8 +81,9 @@ int main(int argc, char **argv)
/* open the encoder */
AudioFormat audio_format(44100, SampleFormat::S16, 2);
if (argc > 2) {
ret = audio_format_parse(&audio_format, argv[2],
ret = audio_format_parse(audio_format, argv[2],
false, &error);
if (!ret) {
g_printerr("Failed to parse audio format: %s\n",
@@ -95,7 +93,7 @@ int main(int argc, char **argv)
}
}
if (!encoder_open(encoder, &audio_format, &error)) {
if (!encoder_open(encoder, audio_format, &error)) {
g_printerr("Failed to open encoder: %s\n",
error->message);
g_error_free(error);