aboutsummaryrefslogtreecommitdiffstats
path: root/src/output_control.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-10 21:50:51 +0100
committerMax Kellermann <max@duempel.org>2009-02-10 21:50:51 +0100
commit61e30759812e6996eb02bacf58607ec53cb0f577 (patch)
tree47599b984c3f87a404daa70a2159477f08afae9b /src/output_control.c
parent744702f266e52defb896b220c7e4eda97cf64b2d (diff)
downloadmpd-61e30759812e6996eb02bacf58607ec53cb0f577.tar.gz
mpd-61e30759812e6996eb02bacf58607ec53cb0f577.tar.xz
mpd-61e30759812e6996eb02bacf58607ec53cb0f577.zip
output_api: no CamelCase in struct audio_output
Renamed audio_output struct members.
Diffstat (limited to '')
-rw-r--r--src/output_control.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/output_control.c b/src/output_control.c
index db3ab5622..323ed1276 100644
--- a/src/output_control.c
+++ b/src/output_control.c
@@ -56,22 +56,22 @@ audio_output_open(struct audio_output *audioOutput,
audioOutput->reopen_after = 0;
if (audioOutput->open &&
- audio_format_equals(audioFormat, &audioOutput->inAudioFormat)) {
+ audio_format_equals(audioFormat, &audioOutput->in_audio_format)) {
return true;
}
- audioOutput->inAudioFormat = *audioFormat;
+ audioOutput->in_audio_format = *audioFormat;
- if (audio_format_defined(&audioOutput->reqAudioFormat)) {
- /* copy reqAudioFormat to outAudioFormat only if the
+ if (audio_format_defined(&audioOutput->config_audio_format)) {
+ /* copy config_audio_format to out_audio_format only if the
device is not yet open; if it is already open,
- plugin->open() may have modified outAudioFormat,
+ plugin->open() may have modified out_audio_format,
and the value is already ok */
if (!audioOutput->open)
- audioOutput->outAudioFormat =
- audioOutput->reqAudioFormat;
+ audioOutput->out_audio_format =
+ audioOutput->config_audio_format;
} else {
- audioOutput->outAudioFormat = audioOutput->inAudioFormat;
+ audioOutput->out_audio_format = audioOutput->in_audio_format;
if (audioOutput->open)
audio_output_close(audioOutput);
}