aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-24 07:20:37 +0200
committerMax Kellermann <max@duempel.org>2008-09-24 07:20:37 +0200
commit3be5db04308d2fb233b33a82089cd9afacf68cc9 (patch)
tree6f24df6b003fd06cf4271264a7d27f8ed05709af
parent2403d32a5007572f853c7782957f86aedf3d3aff (diff)
downloadmpd-3be5db04308d2fb233b33a82089cd9afacf68cc9.tar.gz
mpd-3be5db04308d2fb233b33a82089cd9afacf68cc9.tar.xz
mpd-3be5db04308d2fb233b33a82089cd9afacf68cc9.zip
output: added audio_output_get_name()
Reduce direct accesses to the audio_output struct from the plugins: this time, eliminate all accesses to audio_output.name. The name is required by some plugins for log messages.
Diffstat (limited to '')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/audioOutputs/audioOutput_ao.c2
-rw-r--r--src/output_api.c24
-rw-r--r--src/output_api.h2
4 files changed, 28 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 2069c45c3..8c9508a23 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -114,6 +114,7 @@ mpd_SOURCES = \
notify.c \
audio.c \
audioOutput.c \
+ output_api.c \
output_list.c \
output_thread.c \
output_control.c \
diff --git a/src/audioOutputs/audioOutput_ao.c b/src/audioOutputs/audioOutput_ao.c
index c1266f311..aeb267cef 100644
--- a/src/audioOutputs/audioOutput_ao.c
+++ b/src/audioOutputs/audioOutput_ao.c
@@ -100,7 +100,7 @@ static int audioOutputAo_initDriver(struct audio_output *audioOutput,
}
DEBUG("using ao driver \"%s\" for \"%s\"\n", ai->short_name,
- audioOutput->name);
+ audio_output_get_name(audioOutput));
blockParam = getBlockParam(param, "options");
diff --git a/src/output_api.c b/src/output_api.c
new file mode 100644
index 000000000..e9ac1be06
--- /dev/null
+++ b/src/output_api.c
@@ -0,0 +1,24 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2008 Max Kellermann <max@duempel.org>
+ * This project's homepage is: http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "output_api.h"
+
+const char *audio_output_get_name(const struct audio_output *ao)
+{
+ return ao->name;
+}
diff --git a/src/output_api.h b/src/output_api.h
index 8744fa08e..b76da5cde 100644
--- a/src/output_api.h
+++ b/src/output_api.h
@@ -99,4 +99,6 @@ struct audio_output {
extern struct notify audio_output_client_notify;
+const char *audio_output_get_name(const struct audio_output *ao);
+
#endif