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.
This commit is contained in:
David Woodhouse
2009-07-19 16:24:43 +01:00
parent 4100035b19
commit 37754559b8
19 changed files with 50 additions and 73 deletions

View File

@@ -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);

View File

@@ -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) */

View File

@@ -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) */

View File

@@ -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);