aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-07-19 16:24:43 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-07-19 16:54:11 +0100
commit37754559b8f934ce8d554e0d9f976d4f6eb376d9 (patch)
treeef1387a1a04da7b03065182b581e627f5ea9dda9 /test
parent4100035b19a5d0dedcf8f71a272fa67f6a24361a (diff)
downloadmpd-37754559b8f934ce8d554e0d9f976d4f6eb376d9.tar.gz
mpd-37754559b8f934ce8d554e0d9f976d4f6eb376d9.tar.xz
mpd-37754559b8f934ce8d554e0d9f976d4f6eb376d9.zip
Add audio_format_init() function
It makes no difference right now, but we're about to add an endianness flag and will want to make sure it's correctly initialised every time.
Diffstat (limited to 'test')
-rw-r--r--test/run_encoder.c8
-rw-r--r--test/run_filter.c8
-rw-r--r--test/run_output.c8
-rw-r--r--test/software_volume.c7
4 files changed, 11 insertions, 20 deletions
diff --git a/test/run_encoder.c b/test/run_encoder.c
index 8cb1c6d1d..a9b00e95e 100644
--- a/test/run_encoder.c
+++ b/test/run_encoder.c
@@ -41,11 +41,7 @@ encoder_to_stdout(struct encoder *encoder)
int main(int argc, char **argv)
{
GError *error = NULL;
- struct audio_format audio_format = {
- .sample_rate = 44100,
- .bits = 16,
- .channels = 2,
- };
+ struct audio_format audio_format;
bool ret;
const char *encoder_name;
const struct encoder_plugin *plugin;
@@ -66,6 +62,8 @@ int main(int argc, char **argv)
else
encoder_name = "vorbis";
+ audio_format_init(&audio_format, 44100, 16, 2);
+
/* create the encoder */
plugin = encoder_plugin_get(encoder_name);
diff --git a/test/run_filter.c b/test/run_filter.c
index 0d97207e1..3c98491ab 100644
--- a/test/run_filter.c
+++ b/test/run_filter.c
@@ -70,11 +70,7 @@ load_filter(const char *name)
int main(int argc, char **argv)
{
- struct audio_format audio_format = {
- .sample_rate = 44100,
- .bits = 16,
- .channels = 2,
- };
+ struct audio_format audio_format;
bool success;
GError *error = NULL;
struct filter *filter;
@@ -87,6 +83,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) */
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) */
diff --git a/test/software_volume.c b/test/software_volume.c
index 9a9fd56f6..9e8c8e7d0 100644
--- a/test/software_volume.c
+++ b/test/software_volume.c
@@ -35,11 +35,7 @@
int main(int argc, char **argv)
{
GError *error = NULL;
- struct audio_format audio_format = {
- .sample_rate = 48000,
- .bits = 16,
- .channels = 2,
- };
+ struct audio_format audio_format;
bool ret;
static char buffer[4096];
ssize_t nbytes;
@@ -57,6 +53,7 @@ int main(int argc, char **argv)
return 1;
}
}
+ audio_format_init(&audio_format, 48000, 16, 2);
while ((nbytes = read(0, buffer, sizeof(buffer))) > 0) {
pcm_volume(buffer, nbytes, &audio_format, PCM_VOLUME_1 / 2);