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

test/run_encoder, ...: convert to C++

This commit is contained in:
Max Kellermann 2013-01-30 21:27:37 +01:00
parent ac887d3afb
commit cfeeb7af2e
6 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -1257,7 +1257,7 @@ endif
if ENABLE_ENCODER if ENABLE_ENCODER
noinst_PROGRAMS += test/run_encoder noinst_PROGRAMS += test/run_encoder
test_run_encoder_SOURCES = test/run_encoder.c \ test_run_encoder_SOURCES = test/run_encoder.cxx \
test/stdbin.h \ test/stdbin.h \
src/tokenizer.c src/utils.c src/string_util.c \ src/tokenizer.c src/utils.c src/string_util.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx \ src/Tag.cxx src/TagNames.c src/TagPool.cxx \
@ -1295,7 +1295,7 @@ test_test_vorbis_encoder_LDADD = $(MPD_LIBS) \
$(GLIB_LIBS) $(GLIB_LIBS)
endif endif
test_software_volume_SOURCES = test/software_volume.c \ test_software_volume_SOURCES = test/software_volume.cxx \
test/stdbin.h \ test/stdbin.h \
src/audio_check.c \ src/audio_check.c \
src/audio_parser.c src/audio_parser.c
@ -1311,7 +1311,7 @@ test_run_normalize_SOURCES = test/run_normalize.c \
test_run_normalize_LDADD = \ test_run_normalize_LDADD = \
$(GLIB_LIBS) $(GLIB_LIBS)
test_run_convert_SOURCES = test/run_convert.c \ test_run_convert_SOURCES = test/run_convert.cxx \
src/dsd2pcm/dsd2pcm.c \ src/dsd2pcm/dsd2pcm.c \
src/audio_format.c \ src/audio_format.c \
src/audio_check.c \ src/audio_check.c \

8
src/audio_parser.h
View File

@ -31,6 +31,10 @@
struct audio_format; struct audio_format;
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* Parses a string in the form "SAMPLE_RATE:BITS:CHANNELS" into an * Parses a string in the form "SAMPLE_RATE:BITS:CHANNELS" into an
* #audio_format. * #audio_format.
@ -46,4 +50,8 @@ bool
audio_format_parse(struct audio_format *dest, const char *src, audio_format_parse(struct audio_format *dest, const char *src,
bool mask, GError **error_r); bool mask, GError **error_r);
#ifdef __cplusplus
}
#endif
#endif #endif

8
src/pcm_volume.h
View File

@ -65,6 +65,10 @@ pcm_volume_dither(void)
return (r & 511) - ((r >> 9) & 511); return (r & 511) - ((r >> 9) & 511);
} }
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* Adjust the volume of the specified PCM buffer. * Adjust the volume of the specified PCM buffer.
* *
@ -79,4 +83,8 @@ pcm_volume(void *buffer, size_t length,
enum sample_format format, enum sample_format format,
int volume); int volume);
#ifdef __cplusplus
}
#endif
#endif #endif

2
test/run_convert.c → test/run_convert.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify

4
test/run_encoder.c → test/run_encoder.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -51,7 +51,6 @@ int main(int argc, char **argv)
struct encoder *encoder; struct encoder *encoder;
struct config_param *param; struct config_param *param;
static char buffer[32768]; static char buffer[32768];
ssize_t nbytes;
/* parse command line */ /* parse command line */
@ -110,6 +109,7 @@ int main(int argc, char **argv)
/* do it */ /* do it */
ssize_t nbytes;
while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) { while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
ret = encoder_write(encoder, buffer, nbytes, &error); ret = encoder_write(encoder, buffer, nbytes, &error);
if (!ret) { if (!ret) {

5
test/software_volume.c → test/software_volume.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -59,7 +59,8 @@ int main(int argc, char **argv)
audio_format_init(&audio_format, 48000, SAMPLE_FORMAT_S16, 2); audio_format_init(&audio_format, 48000, SAMPLE_FORMAT_S16, 2);
while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) { while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
if (!pcm_volume(buffer, nbytes, audio_format.format, if (!pcm_volume(buffer, nbytes,
sample_format(audio_format.format),
PCM_VOLUME_1 / 2)) { PCM_VOLUME_1 / 2)) {
g_printerr("pcm_volume() has failed\n"); g_printerr("pcm_volume() has failed\n");
return 2; return 2;