aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_thread.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/output_thread.c')
-rw-r--r--src/output_thread.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/output_thread.c b/src/output_thread.c
index 883dddcaf..ef636180f 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -46,10 +46,10 @@ static void ao_play(struct audio_output *ao)
assert(size > 0);
- if (!audio_format_equals(&ao->inAudioFormat, &ao->outAudioFormat)) {
- data = pcm_convert(&ao->convState,
- &ao->inAudioFormat, data, size,
- &ao->outAudioFormat, &size);
+ if (!audio_format_equals(&ao->in_audio_format, &ao->out_audio_format)) {
+ data = pcm_convert(&ao->convert_state,
+ &ao->in_audio_format, data, size,
+ &ao->out_audio_format, &size);
/* under certain circumstances, pcm_convert() may
return an empty buffer - this condition should be
@@ -63,7 +63,7 @@ static void ao_play(struct audio_output *ao)
if (!ret) {
ao->plugin->cancel(ao->data);
ao->plugin->close(ao->data);
- pcm_convert_deinit(&ao->convState);
+ pcm_convert_deinit(&ao->convert_state);
ao->open = false;
}
@@ -84,7 +84,7 @@ static void ao_pause(struct audio_output *ao)
ret = ao->plugin->pause(ao->data);
if (!ret) {
ao->plugin->close(ao->data);
- pcm_convert_deinit(&ao->convState);
+ pcm_convert_deinit(&ao->convert_state);
ao->open = false;
}
} while (ao->command == AO_COMMAND_NONE);
@@ -109,9 +109,9 @@ static gpointer audio_output_task(gpointer arg)
case AO_COMMAND_OPEN:
assert(!ao->open);
- pcm_convert_init(&ao->convState);
+ pcm_convert_init(&ao->convert_state);
ret = ao->plugin->open(ao->data,
- &ao->outAudioFormat);
+ &ao->out_audio_format);
assert(!ao->open);
if (ret == true)