aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile.am3
-rw-r--r--src/audio.c2
-rw-r--r--src/audioOutput.c196
-rw-r--r--src/audioOutput.h19
-rw-r--r--src/output_control.c123
-rw-r--r--src/output_control.h41
-rw-r--r--src/output_init.c113
7 files changed, 281 insertions, 216 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 076802015..fb1508d43 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,6 +35,7 @@ mpd_headers = \
audioOutput.h \
output_api.h \
output_list.h \
+ output_control.h \
buffer2array.h \
charConv.h \
command.h \
@@ -109,6 +110,8 @@ mpd_SOURCES = \
audio.c \
audioOutput.c \
output_list.c \
+ output_control.c \
+ output_init.c \
buffer2array.c \
charConv.c \
command.c \
diff --git a/src/audio.c b/src/audio.c
index 44a97e65a..c6b0285d8 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -18,8 +18,8 @@
#include "audio.h"
#include "audio_format.h"
-#include "audioOutput.h"
#include "output_api.h"
+#include "output_control.h"
#include "log.h"
#include "path.h"
#include "client.h"
diff --git a/src/audioOutput.c b/src/audioOutput.c
index 6a8162cec..bc619ceb0 100644
--- a/src/audioOutput.c
+++ b/src/audioOutput.c
@@ -20,202 +20,6 @@
#include "output_api.h"
#include "output_list.h"
-#include "log.h"
-#include "pcm_utils.h"
-#include "utils.h"
-#include "os_compat.h"
-#include "audio.h"
-
-#define AUDIO_OUTPUT_TYPE "type"
-#define AUDIO_OUTPUT_NAME "name"
-#define AUDIO_OUTPUT_FORMAT "format"
-
-#define getBlockParam(name, str, force) { \
- bp = getBlockParam(param, name); \
- if(force && bp == NULL) { \
- FATAL("couldn't find parameter \"%s\" in audio output " \
- "definition beginning at %i\n", \
- name, param->line); \
- } \
- if(bp) str = bp->value; \
-}
-
-int initAudioOutput(struct audio_output *ao, ConfigParam * param)
-{
- const char *name = NULL;
- char *format = NULL;
- BlockParam *bp = NULL;
- const struct audio_output_plugin *plugin = NULL;
-
- if (param) {
- const char *type = NULL;
-
- getBlockParam(AUDIO_OUTPUT_NAME, name, 1);
- getBlockParam(AUDIO_OUTPUT_TYPE, type, 1);
- getBlockParam(AUDIO_OUTPUT_FORMAT, format, 0);
-
- plugin = audio_output_plugin_get(type);
- if (plugin == NULL) {
- FATAL("couldn't find audio output plugin for type "
- "\"%s\" at line %i\n", type, param->line);
- }
- } else {
- unsigned i;
-
- WARNING("No \"%s\" defined in config file\n",
- CONF_AUDIO_OUTPUT);
- WARNING("Attempt to detect audio output device\n");
-
- audio_output_plugins_for_each(plugin, i) {
- if (plugin->test_default_device) {
- WARNING("Attempting to detect a %s audio "
- "device\n", plugin->name);
- if (plugin->test_default_device() == 0) {
- WARNING("Successfully detected a %s "
- "audio device\n", plugin->name);
- break;
- }
- }
- }
-
- if (plugin == NULL) {
- WARNING("Unable to detect an audio device\n");
- return 0;
- }
-
- name = "default detected output";
- }
-
- ao->name = name;
- ao->plugin = plugin;
- ao->open = 0;
-
- ao->convertAudioFormat = 0;
- ao->sameInAndOutFormats = 0;
- ao->convBuffer = NULL;
- ao->convBufferLen = 0;
-
- memset(&ao->inAudioFormat, 0, sizeof(ao->inAudioFormat));
- memset(&ao->outAudioFormat, 0, sizeof(ao->outAudioFormat));
- memset(&ao->reqAudioFormat, 0, sizeof(ao->reqAudioFormat));
- memset(&ao->convState, 0, sizeof(ConvState));
-
- if (format) {
- ao->convertAudioFormat = 1;
-
- if (0 != parseAudioConfig(&ao->reqAudioFormat, format)) {
- FATAL("error parsing format at line %i\n", bp->line);
- }
-
- copyAudioFormat(&ao->outAudioFormat, &ao->reqAudioFormat);
- }
-
- if (plugin->init(ao, param) != 0)
- return 0;
-
- return 1;
-}
-
-int openAudioOutput(struct audio_output *audioOutput,
- const struct audio_format *audioFormat)
-{
- int ret = 0;
-
- if (audioOutput->open &&
- 0 == cmpAudioFormat(audioFormat, &audioOutput->inAudioFormat)) {
- return 0;
- }
-
- copyAudioFormat(&audioOutput->inAudioFormat, audioFormat);
-
- if (audioOutput->convertAudioFormat) {
- copyAudioFormat(&audioOutput->outAudioFormat,
- &audioOutput->reqAudioFormat);
- } else {
- copyAudioFormat(&audioOutput->outAudioFormat,
- &audioOutput->inAudioFormat);
- if (audioOutput->open)
- closeAudioOutput(audioOutput);
- }
-
- if (!audioOutput->open)
- ret = audioOutput->plugin->open(audioOutput);
-
- audioOutput->sameInAndOutFormats =
- !cmpAudioFormat(&audioOutput->inAudioFormat,
- &audioOutput->outAudioFormat);
-
- return ret;
-}
-
-static void convertAudioFormat(struct audio_output *audioOutput,
- const char **chunkArgPtr, size_t *sizeArgPtr)
-{
- size_t size = pcm_sizeOfConvBuffer(&(audioOutput->inAudioFormat),
- *sizeArgPtr,
- &(audioOutput->outAudioFormat));
-
- if (size > audioOutput->convBufferLen) {
- if (audioOutput->convBuffer != NULL)
- free(audioOutput->convBuffer);
- audioOutput->convBuffer = xmalloc(size);
- audioOutput->convBufferLen = size;
- }
-
- *sizeArgPtr = pcm_convertAudioFormat(&(audioOutput->inAudioFormat),
- *chunkArgPtr, *sizeArgPtr,
- &(audioOutput->outAudioFormat),
- audioOutput->convBuffer,
- &audioOutput->convState);
-
- *chunkArgPtr = audioOutput->convBuffer;
-}
-
-int playAudioOutput(struct audio_output *audioOutput,
- const char *playChunk, size_t size)
-{
- int ret;
-
- if (!audioOutput->open)
- return -1;
-
- if (!audioOutput->sameInAndOutFormats) {
- convertAudioFormat(audioOutput, &playChunk, &size);
- }
-
- ret = audioOutput->plugin->play(audioOutput, playChunk, size);
-
- return ret;
-}
-
-void dropBufferedAudioOutput(struct audio_output *audioOutput)
-{
- if (audioOutput->open)
- audioOutput->plugin->cancel(audioOutput);
-}
-
-void closeAudioOutput(struct audio_output *audioOutput)
-{
- if (audioOutput->open)
- audioOutput->plugin->close(audioOutput);
-}
-
-void finishAudioOutput(struct audio_output *audioOutput)
-{
- closeAudioOutput(audioOutput);
- if (audioOutput->plugin->finish)
- audioOutput->plugin->finish(audioOutput);
- if (audioOutput->convBuffer)
- free(audioOutput->convBuffer);
-}
-
-void sendMetadataToAudioOutput(struct audio_output *audioOutput,
- const struct tag *tag)
-{
- if (audioOutput->plugin->send_tag)
- audioOutput->plugin->send_tag(audioOutput, tag);
-}
-
void printAllOutputPluginTypes(FILE * fp)
{
unsigned i;
diff --git a/src/audioOutput.h b/src/audioOutput.h
index e2d628d04..cdb3c73eb 100644
--- a/src/audioOutput.h
+++ b/src/audioOutput.h
@@ -19,27 +19,8 @@
#ifndef AUDIO_OUTPUT_H
#define AUDIO_OUTPUT_H
-#include "../config.h"
-
-#include "conf.h"
#include "os_compat.h"
-struct audio_output;
-struct audio_output_plugin;
-struct audio_format;
-struct tag;
-
-int initAudioOutput(struct audio_output *, ConfigParam * param);
-int openAudioOutput(struct audio_output *audioOutput,
- const struct audio_format *audioFormat);
-int playAudioOutput(struct audio_output *audioOutput,
- const char *playChunk, size_t size);
-void dropBufferedAudioOutput(struct audio_output *audioOutput);
-void closeAudioOutput(struct audio_output *audioOutput);
-void finishAudioOutput(struct audio_output *audioOutput);
-void sendMetadataToAudioOutput(struct audio_output *audioOutput,
- const struct tag *tag);
-
void printAllOutputPluginTypes(FILE * fp);
#endif
diff --git a/src/output_control.c b/src/output_control.c
new file mode 100644
index 000000000..a6a8cac74
--- /dev/null
+++ b/src/output_control.c
@@ -0,0 +1,123 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * 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_control.h"
+#include "output_api.h"
+#include "pcm_utils.h"
+#include "utils.h"
+#include "audio.h"
+
+int openAudioOutput(struct audio_output *audioOutput,
+ const struct audio_format *audioFormat)
+{
+ int ret = 0;
+
+ if (audioOutput->open &&
+ 0 == cmpAudioFormat(audioFormat, &audioOutput->inAudioFormat)) {
+ return 0;
+ }
+
+ copyAudioFormat(&audioOutput->inAudioFormat, audioFormat);
+
+ if (audioOutput->convertAudioFormat) {
+ copyAudioFormat(&audioOutput->outAudioFormat,
+ &audioOutput->reqAudioFormat);
+ } else {
+ copyAudioFormat(&audioOutput->outAudioFormat,
+ &audioOutput->inAudioFormat);
+ if (audioOutput->open)
+ closeAudioOutput(audioOutput);
+ }
+
+ if (!audioOutput->open)
+ ret = audioOutput->plugin->open(audioOutput);
+
+ audioOutput->sameInAndOutFormats =
+ !cmpAudioFormat(&audioOutput->inAudioFormat,
+ &audioOutput->outAudioFormat);
+
+ return ret;
+}
+
+static void convertAudioFormat(struct audio_output *audioOutput,
+ const char **chunkArgPtr, size_t *sizeArgPtr)
+{
+ size_t size = pcm_sizeOfConvBuffer(&(audioOutput->inAudioFormat),
+ *sizeArgPtr,
+ &(audioOutput->outAudioFormat));
+
+ if (size > audioOutput->convBufferLen) {
+ if (audioOutput->convBuffer != NULL)
+ free(audioOutput->convBuffer);
+ audioOutput->convBuffer = xmalloc(size);
+ audioOutput->convBufferLen = size;
+ }
+
+ *sizeArgPtr = pcm_convertAudioFormat(&(audioOutput->inAudioFormat),
+ *chunkArgPtr, *sizeArgPtr,
+ &(audioOutput->outAudioFormat),
+ audioOutput->convBuffer,
+ &audioOutput->convState);
+
+ *chunkArgPtr = audioOutput->convBuffer;
+}
+
+int playAudioOutput(struct audio_output *audioOutput,
+ const char *playChunk, size_t size)
+{
+ int ret;
+
+ if (!audioOutput->open)
+ return -1;
+
+ if (!audioOutput->sameInAndOutFormats) {
+ convertAudioFormat(audioOutput, &playChunk, &size);
+ }
+
+ ret = audioOutput->plugin->play(audioOutput, playChunk, size);
+
+ return ret;
+}
+
+void dropBufferedAudioOutput(struct audio_output *audioOutput)
+{
+ if (audioOutput->open)
+ audioOutput->plugin->cancel(audioOutput);
+}
+
+void closeAudioOutput(struct audio_output *audioOutput)
+{
+ if (audioOutput->open)
+ audioOutput->plugin->close(audioOutput);
+}
+
+void finishAudioOutput(struct audio_output *audioOutput)
+{
+ closeAudioOutput(audioOutput);
+ if (audioOutput->plugin->finish)
+ audioOutput->plugin->finish(audioOutput);
+ if (audioOutput->convBuffer)
+ free(audioOutput->convBuffer);
+}
+
+void sendMetadataToAudioOutput(struct audio_output *audioOutput,
+ const struct tag *tag)
+{
+ if (audioOutput->plugin->send_tag)
+ audioOutput->plugin->send_tag(audioOutput, tag);
+}
diff --git a/src/output_control.h b/src/output_control.h
new file mode 100644
index 000000000..6d646466d
--- /dev/null
+++ b/src/output_control.h
@@ -0,0 +1,41 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * 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
+ */
+
+#ifndef OUTPUT_CONTROL_H
+#define OUTPUT_CONTROL_H
+
+#include "conf.h"
+#include "os_compat.h"
+
+struct audio_output;
+struct audio_output_plugin;
+struct audio_format;
+struct tag;
+
+int initAudioOutput(struct audio_output *, ConfigParam * param);
+int openAudioOutput(struct audio_output *audioOutput,
+ const struct audio_format *audioFormat);
+int playAudioOutput(struct audio_output *audioOutput,
+ const char *playChunk, size_t size);
+void dropBufferedAudioOutput(struct audio_output *audioOutput);
+void closeAudioOutput(struct audio_output *audioOutput);
+void finishAudioOutput(struct audio_output *audioOutput);
+void sendMetadataToAudioOutput(struct audio_output *audioOutput,
+ const struct tag *tag);
+
+#endif
diff --git a/src/output_init.c b/src/output_init.c
new file mode 100644
index 000000000..da76c7214
--- /dev/null
+++ b/src/output_init.c
@@ -0,0 +1,113 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * 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_control.h"
+#include "output_api.h"
+#include "output_list.h"
+#include "log.h"
+#include "audio.h"
+
+#define AUDIO_OUTPUT_TYPE "type"
+#define AUDIO_OUTPUT_NAME "name"
+#define AUDIO_OUTPUT_FORMAT "format"
+
+#define getBlockParam(name, str, force) { \
+ bp = getBlockParam(param, name); \
+ if(force && bp == NULL) { \
+ FATAL("couldn't find parameter \"%s\" in audio output " \
+ "definition beginning at %i\n", \
+ name, param->line); \
+ } \
+ if(bp) str = bp->value; \
+}
+
+int initAudioOutput(struct audio_output *ao, ConfigParam * param)
+{
+ const char *name = NULL;
+ char *format = NULL;
+ BlockParam *bp = NULL;
+ const struct audio_output_plugin *plugin = NULL;
+
+ if (param) {
+ const char *type = NULL;
+
+ getBlockParam(AUDIO_OUTPUT_NAME, name, 1);
+ getBlockParam(AUDIO_OUTPUT_TYPE, type, 1);
+ getBlockParam(AUDIO_OUTPUT_FORMAT, format, 0);
+
+ plugin = audio_output_plugin_get(type);
+ if (plugin == NULL) {
+ FATAL("couldn't find audio output plugin for type "
+ "\"%s\" at line %i\n", type, param->line);
+ }
+ } else {
+ unsigned i;
+
+ WARNING("No \"%s\" defined in config file\n",
+ CONF_AUDIO_OUTPUT);
+ WARNING("Attempt to detect audio output device\n");
+
+ audio_output_plugins_for_each(plugin, i) {
+ if (plugin->test_default_device) {
+ WARNING("Attempting to detect a %s audio "
+ "device\n", plugin->name);
+ if (plugin->test_default_device() == 0) {
+ WARNING("Successfully detected a %s "
+ "audio device\n", plugin->name);
+ break;
+ }
+ }
+ }
+
+ if (plugin == NULL) {
+ WARNING("Unable to detect an audio device\n");
+ return 0;
+ }
+
+ name = "default detected output";
+ }
+
+ ao->name = name;
+ ao->plugin = plugin;
+ ao->open = 0;
+
+ ao->convertAudioFormat = 0;
+ ao->sameInAndOutFormats = 0;
+ ao->convBuffer = NULL;
+ ao->convBufferLen = 0;
+
+ memset(&ao->inAudioFormat, 0, sizeof(ao->inAudioFormat));
+ memset(&ao->outAudioFormat, 0, sizeof(ao->outAudioFormat));
+ memset(&ao->reqAudioFormat, 0, sizeof(ao->reqAudioFormat));
+ memset(&ao->convState, 0, sizeof(ConvState));
+
+ if (format) {
+ ao->convertAudioFormat = 1;
+
+ if (0 != parseAudioConfig(&ao->reqAudioFormat, format)) {
+ FATAL("error parsing format at line %i\n", bp->line);
+ }
+
+ copyAudioFormat(&ao->outAudioFormat, &ao->reqAudioFormat);
+ }
+
+ if (plugin->init(ao, param) != 0)
+ return 0;
+
+ return 1;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 20:39:06 +0000