aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile.am1
-rw-r--r--src/audio.c1
-rw-r--r--src/audioOutput.c1
-rw-r--r--src/audioOutput.h67
-rw-r--r--src/audioOutputs/audioOutput_alsa.c5
-rw-r--r--src/audioOutputs/audioOutput_ao.c5
-rw-r--r--src/audioOutputs/audioOutput_fifo.c4
-rw-r--r--src/audioOutputs/audioOutput_jack.c5
-rw-r--r--src/audioOutputs/audioOutput_mvp.c5
-rw-r--r--src/audioOutputs/audioOutput_null.c2
-rw-r--r--src/audioOutputs/audioOutput_oss.c5
-rw-r--r--src/audioOutputs/audioOutput_osx.c3
-rw-r--r--src/audioOutputs/audioOutput_pulse.c5
-rw-r--r--src/audioOutputs/audioOutput_shout.c5
-rw-r--r--src/output_api.h91
15 files changed, 115 insertions, 90 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 27fe578b0..075dd75e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,6 +33,7 @@ mpd_headers = \
ack.h \
audio.h \
audioOutput.h \
+ output_api.h \
buffer2array.h \
charConv.h \
command.h \
diff --git a/src/audio.c b/src/audio.c
index 0e347d6ad..0650f364c 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -22,6 +22,7 @@
#include "log.h"
#include "path.h"
#include "client.h"
+#include "utils.h"
#include "os_compat.h"
#define AUDIO_DEVICE_STATE "audio_device_state:"
diff --git a/src/audioOutput.c b/src/audioOutput.c
index 7e9793f93..47e6dbc94 100644
--- a/src/audioOutput.c
+++ b/src/audioOutput.c
@@ -21,6 +21,7 @@
#include "list.h"
#include "log.h"
#include "pcm_utils.h"
+#include "utils.h"
#include "os_compat.h"
#include "audio.h"
diff --git a/src/audioOutput.h b/src/audioOutput.h
index d706b602e..82767343b 100644
--- a/src/audioOutput.h
+++ b/src/audioOutput.h
@@ -19,75 +19,14 @@
#ifndef AUDIO_OUTPUT_H
#define AUDIO_OUTPUT_H
+#include "output_api.h"
#include "../config.h"
-#include "pcm_utils.h"
-#include "mpd_types.h"
-#include "audio_format.h"
-#include "tag.h"
#include "conf.h"
-#include "utils.h"
#include "os_compat.h"
-#define DISABLED_AUDIO_OUTPUT_PLUGIN(plugin) AudioOutputPlugin plugin;
-
-typedef struct _AudioOutput AudioOutput;
-
-typedef int (*AudioOutputTestDefaultDeviceFunc) (void);
-
-typedef int (*AudioOutputInitDriverFunc) (AudioOutput * audioOutput,
- ConfigParam * param);
-
-typedef void (*AudioOutputFinishDriverFunc) (AudioOutput * audioOutput);
-
-typedef int (*AudioOutputOpenDeviceFunc) (AudioOutput * audioOutput);
-
-typedef int (*AudioOutputPlayFunc) (AudioOutput * audioOutput,
- const char *playChunk, size_t size);
-
-typedef void (*AudioOutputDropBufferedAudioFunc) (AudioOutput * audioOutput);
-
-typedef void (*AudioOutputCloseDeviceFunc) (AudioOutput * audioOutput);
-
-typedef void (*AudioOutputSendMetadataFunc) (AudioOutput * audioOutput,
- const struct tag *tag);
-
-struct _AudioOutput {
- int open;
- const char *name;
- const char *type;
-
- AudioOutputFinishDriverFunc finishDriverFunc;
- AudioOutputOpenDeviceFunc openDeviceFunc;
- AudioOutputPlayFunc playFunc;
- AudioOutputDropBufferedAudioFunc dropBufferedAudioFunc;
- AudioOutputCloseDeviceFunc closeDeviceFunc;
- AudioOutputSendMetadataFunc sendMetdataFunc;
-
- int convertAudioFormat;
- struct audio_format inAudioFormat;
- struct audio_format outAudioFormat;
- struct audio_format reqAudioFormat;
- ConvState convState;
- char *convBuffer;
- size_t convBufferLen;
- int sameInAndOutFormats;
-
- void *data;
-};
-
-typedef struct _AudioOutputPlugin {
- const char *name;
-
- AudioOutputTestDefaultDeviceFunc testDefaultDeviceFunc;
- AudioOutputInitDriverFunc initDriverFunc;
- AudioOutputFinishDriverFunc finishDriverFunc;
- AudioOutputOpenDeviceFunc openDeviceFunc;
- AudioOutputPlayFunc playFunc;
- AudioOutputDropBufferedAudioFunc dropBufferedAudioFunc;
- AudioOutputCloseDeviceFunc closeDeviceFunc;
- AudioOutputSendMetadataFunc sendMetdataFunc;
-} AudioOutputPlugin;
+struct audio_format;
+struct tag;
void initAudioOutputPlugins(void);
void finishAudioOutputPlugins(void);
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c
index 9bb962fb5..3021d59da 100644
--- a/src/audioOutputs/audioOutput_alsa.c
+++ b/src/audioOutputs/audioOutput_alsa.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
+#include "../output_api.h"
#ifdef HAVE_ALSA
@@ -30,9 +30,8 @@
#define MPD_ALSA_PERIOD_TIME_US 50000
#define MPD_ALSA_RETRY_NR 5
-#include "../conf.h"
+#include "../utils.h"
#include "../log.h"
-#include "../os_compat.h"
#include <alsa/asoundlib.h>
diff --git a/src/audioOutputs/audioOutput_ao.c b/src/audioOutputs/audioOutput_ao.c
index e7e201add..8c049fb2f 100644
--- a/src/audioOutputs/audioOutput_ao.c
+++ b/src/audioOutputs/audioOutput_ao.c
@@ -16,13 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
+#include "../output_api.h"
#ifdef HAVE_AO
-#include "../conf.h"
+#include "../utils.h"
#include "../log.h"
-#include "../os_compat.h"
#include <ao/ao.h>
diff --git a/src/audioOutputs/audioOutput_fifo.c b/src/audioOutputs/audioOutput_fifo.c
index 0c279667d..a539856c1 100644
--- a/src/audioOutputs/audioOutput_fifo.c
+++ b/src/audioOutputs/audioOutput_fifo.c
@@ -16,13 +16,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
-#include "../os_compat.h"
+#include "../output_api.h"
#ifdef HAVE_FIFO
#include "../log.h"
-#include "../conf.h"
#include "../utils.h"
#include "../timer.h"
diff --git a/src/audioOutputs/audioOutput_jack.c b/src/audioOutputs/audioOutput_jack.c
index d9b6010e5..9fef6f439 100644
--- a/src/audioOutputs/audioOutput_jack.c
+++ b/src/audioOutputs/audioOutput_jack.c
@@ -15,12 +15,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
+#include "../output_api.h"
#ifdef HAVE_JACK
-#include "../os_compat.h"
-#include "../conf.h"
+#include "../utils.h"
#include "../log.h"
#include <jack/jack.h>
diff --git a/src/audioOutputs/audioOutput_mvp.c b/src/audioOutputs/audioOutput_mvp.c
index 2b8ba6a00..59e40f472 100644
--- a/src/audioOutputs/audioOutput_mvp.c
+++ b/src/audioOutputs/audioOutput_mvp.c
@@ -19,12 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
-#include "../os_compat.h"
+#include "../output_api.h"
#ifdef HAVE_MVP
-#include "../conf.h"
+#include "../utils.h"
#include "../log.h"
typedef struct {
diff --git a/src/audioOutputs/audioOutput_null.c b/src/audioOutputs/audioOutput_null.c
index d63004645..ed4c46309 100644
--- a/src/audioOutputs/audioOutput_null.c
+++ b/src/audioOutputs/audioOutput_null.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
+#include "../output_api.h"
#include "../timer.h"
static int null_initDriver(AudioOutput *audioOutput,
diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c
index 0c9d408f4..aea33be82 100644
--- a/src/audioOutputs/audioOutput_oss.c
+++ b/src/audioOutputs/audioOutput_oss.c
@@ -19,12 +19,11 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
-#include "../os_compat.h"
+#include "../output_api.h"
#ifdef HAVE_OSS
-#include "../conf.h"
+#include "../utils.h"
#include "../log.h"
#if defined(__OpenBSD__) || defined(__NetBSD__)
diff --git a/src/audioOutputs/audioOutput_osx.c b/src/audioOutputs/audioOutput_osx.c
index 4da921b4c..f0fee15e9 100644
--- a/src/audioOutputs/audioOutput_osx.c
+++ b/src/audioOutputs/audioOutput_osx.c
@@ -16,12 +16,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
+#include "../output_api.h"
#ifdef HAVE_OSX
#include <AudioUnit/AudioUnit.h>
+#include "../utils.h"
#include "../log.h"
typedef struct _OsxData {
diff --git a/src/audioOutputs/audioOutput_pulse.c b/src/audioOutputs/audioOutput_pulse.c
index 70e35b4d9..6151787f0 100644
--- a/src/audioOutputs/audioOutput_pulse.c
+++ b/src/audioOutputs/audioOutput_pulse.c
@@ -16,13 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
+#include "../output_api.h"
#ifdef HAVE_PULSE
-#include "../conf.h"
+#include "../utils.h"
#include "../log.h"
-#include "../os_compat.h"
#include <pulse/simple.h>
#include <pulse/error.h>
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index e5d87dbfe..c7677555c 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -16,13 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../audioOutput.h"
+#include "../output_api.h"
#ifdef HAVE_SHOUT
-#include "../conf.h"
+#include "../utils.h"
#include "../log.h"
-#include "../pcm_utils.h"
#include "../timer.h"
#include <shout/shout.h>
diff --git a/src/output_api.h b/src/output_api.h
new file mode 100644
index 000000000..7391af1c7
--- /dev/null
+++ b/src/output_api.h
@@ -0,0 +1,91 @@
+/* the Music Player Daemon (MPD)
+ * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
+ * 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
+ */
+
+#ifndef OUTPUT_API_H
+#define OUTPUT_API_H
+
+#include "../config.h"
+#include "pcm_utils.h"
+#include "audio_format.h"
+#include "tag.h"
+#include "conf.h"
+#include "log.h"
+#include "os_compat.h"
+
+#define DISABLED_AUDIO_OUTPUT_PLUGIN(plugin) AudioOutputPlugin plugin;
+
+typedef struct _AudioOutput AudioOutput;
+
+typedef int (*AudioOutputTestDefaultDeviceFunc) (void);
+
+typedef int (*AudioOutputInitDriverFunc) (AudioOutput * audioOutput,
+ ConfigParam * param);
+
+typedef void (*AudioOutputFinishDriverFunc) (AudioOutput * audioOutput);
+
+typedef int (*AudioOutputOpenDeviceFunc) (AudioOutput * audioOutput);
+
+typedef int (*AudioOutputPlayFunc) (AudioOutput * audioOutput,
+ const char *playChunk, size_t size);
+
+typedef void (*AudioOutputDropBufferedAudioFunc) (AudioOutput * audioOutput);
+
+typedef void (*AudioOutputCloseDeviceFunc) (AudioOutput * audioOutput);
+
+typedef void (*AudioOutputSendMetadataFunc) (AudioOutput * audioOutput,
+ const struct tag *tag);
+
+typedef struct _AudioOutputPlugin {
+ const char *name;
+
+ AudioOutputTestDefaultDeviceFunc testDefaultDeviceFunc;
+ AudioOutputInitDriverFunc initDriverFunc;
+ AudioOutputFinishDriverFunc finishDriverFunc;
+ AudioOutputOpenDeviceFunc openDeviceFunc;
+ AudioOutputPlayFunc playFunc;
+ AudioOutputDropBufferedAudioFunc dropBufferedAudioFunc;
+ AudioOutputCloseDeviceFunc closeDeviceFunc;
+ AudioOutputSendMetadataFunc sendMetdataFunc;
+} AudioOutputPlugin;
+
+struct _AudioOutput {
+ int open;
+ const char *name;
+ const char *type;
+
+ AudioOutputFinishDriverFunc finishDriverFunc;
+ AudioOutputOpenDeviceFunc openDeviceFunc;
+ AudioOutputPlayFunc playFunc;
+ AudioOutputDropBufferedAudioFunc dropBufferedAudioFunc;
+ AudioOutputCloseDeviceFunc closeDeviceFunc;
+ AudioOutputSendMetadataFunc sendMetdataFunc;
+
+ int convertAudioFormat;
+ struct audio_format inAudioFormat;
+ struct audio_format outAudioFormat;
+ struct audio_format reqAudioFormat;
+ ConvState convState;
+ char *convBuffer;
+ size_t convBufferLen;
+ int sameInAndOutFormats;
+
+ void *data;
+};
+
+#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 05:50:02 +0000