aboutsummaryrefslogtreecommitdiffstats
path: root/src/audioOutputs
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-07 22:41:17 +0200
committerMax Kellermann <max@duempel.org>2008-09-07 22:41:17 +0200
commitbed2a49fe97b8f070ace2dd37909bb06540c66bd (patch)
treeaa5700adc8317362f121fea88596471ca2c7ba48 /src/audioOutputs
parentdc7c6bd14d0737f4c7c09c315a6806a901cf9976 (diff)
downloadmpd-bed2a49fe97b8f070ace2dd37909bb06540c66bd.tar.gz
mpd-bed2a49fe97b8f070ace2dd37909bb06540c66bd.tar.xz
mpd-bed2a49fe97b8f070ace2dd37909bb06540c66bd.zip
output: added output_api.h
Just like decoder_api.h, output_api.h provides the audio output API which is used by the plugins.
Diffstat (limited to 'src/audioOutputs')
-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
10 files changed, 18 insertions, 26 deletions
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>