summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AUTHORS2
-rw-r--r--DOCS/man/en/mplayer.12
-rw-r--r--DOCS/tech/MAINTAINERS2
-rw-r--r--Makefile2
-rwxr-xr-xconfigure4
-rw-r--r--libao2/ao_coreaudio.c (renamed from libao2/ao_macosx.c)16
-rw-r--r--libao2/audio_out.c4
7 files changed, 16 insertions, 16 deletions
diff --git a/AUTHORS b/AUTHORS
index 99f52fa8de..ff606dee4b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -168,7 +168,7 @@ Bunkus, Moritz (Mosu) <moritz@bunkus.org>
Christiansen, Dan Villiom Podlaski (danchr) <danchr@daimi.au.dk>
* timer-darwin.c
- * ao_macosx
+ * CoreAudio audio output driver for Mac OS X
* build system cleanups for Darwin
Clagg, Jeff (snacky) <snacky@ikaruga.co.uk>
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index f5b1f4999e..68d8ee317e 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -2786,7 +2786,7 @@ Note that this seems unreliable and will spam stdout with server messages.
audio output through NAS
.
.TP
-.B macosx (Mac OS X only)
+.B coreaudio (Mac OS X only)
native Mac OS X audio output driver
.
.TP
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index 87f4fbfdc0..198d2711ea 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -204,12 +204,12 @@ libao2 drivers:
* ao_alsa5.c - None
* ao_alsa.c - Clemens Ladisch
* ao_arts.c - None
+ * ao_coreaudio.c - None
* ao_dsound.c - None
* ao_dxr2.c - None
* ao_esd.c - None
* ao_ivtv.c - Benjamin Zores
* ao_jack.c - Reimar Döffinger
- * ao_macosx.c - None
* ao_mpegpes.c - None
* ao_nas.c - Tobias Diedrich
* ao_null.c - None
diff --git a/Makefile b/Makefile
index 662d7807a0..c56aa88e86 100644
--- a/Makefile
+++ b/Makefile
@@ -531,7 +531,7 @@ SRCS_MPLAYER-$(APPLE_REMOTE) += input/ar.c
SRCS_MPLAYER-$(ARTS) += libao2/ao_arts.c
SRCS_MPLAYER-$(BL) += libvo/vo_bl.c
SRCS_MPLAYER-$(CACA) += libvo/vo_caca.c
-SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_macosx.c
+SRCS_MPLAYER-$(COREAUDIO) += libao2/ao_coreaudio.c
SRCS_MPLAYER-$(COREVIDEO) += libvo/vo_macosx.m
SRCS_MPLAYER-$(DART) += libao2/ao_dart.c
SRCS_MPLAYER-$(DFBMGA) += libvo/vo_dfbmga.c
diff --git a/configure b/configure
index 8b15401349..488783e81b 100755
--- a/configure
+++ b/configure
@@ -3815,10 +3815,10 @@ fi
if test "$_coreaudio" = yes ; then
extra_ldflags="$extra_ldflags -framework CoreAudio -framework AudioUnit -framework AudioToolbox"
def_coreaudio='#define CONFIG_COREAUDIO 1'
- _aomodules="macosx $_aomodules"
+ _aomodules="coreaudio $_aomodules"
else
def_coreaudio='#undef CONFIG_COREAUDIO'
- _noaomodules="macosx $_noaomodules"
+ _noaomodules="coreaudio $_noaomodules"
fi
echores $_coreaudio
diff --git a/libao2/ao_macosx.c b/libao2/ao_coreaudio.c
index 7589e296d9..18a2fd7cf1 100644
--- a/libao2/ao_macosx.c
+++ b/libao2/ao_coreaudio.c
@@ -1,5 +1,5 @@
/*
- * Mac OS X audio output driver
+ * CoreAudio audio output driver for Mac OS X
*
* original copyright (C) Timothy J. Wood - Aug 2000
* ported to MPlayer libao2 by Dan Christiansen
@@ -57,17 +57,17 @@
static const ao_info_t info =
{
"Darwin/Mac OS X native audio output",
- "macosx",
+ "coreaudio",
"Timothy J. Wood & Dan Christiansen & Chris Roccati",
""
};
-LIBAO_EXTERN(macosx)
+LIBAO_EXTERN(coreaudio)
/* Prefix for all mp_msg() calls */
-#define ao_msg(a, b, c...) mp_msg(a, b, "AO: [macosx] " c)
+#define ao_msg(a, b, c...) mp_msg(a, b, "AO: [coreaudio] " c)
-typedef struct ao_macosx_s
+typedef struct ao_coreaudio_s
{
AudioDeviceID i_selected_dev; /* Keeps DeviceID of the selected device. */
int b_supports_digital; /* Does the currently selected device support digital mode? */
@@ -96,9 +96,9 @@ typedef struct ao_macosx_s
unsigned int buffer_len; ///< must always be num_chunks * chunk_size
unsigned int num_chunks;
unsigned int chunk_size;
-} ao_macosx_t;
+} ao_coreaudio_t;
-static ao_macosx_t *ao = NULL;
+static ao_coreaudio_t *ao = NULL;
/**
* \brief add data to ringbuffer
@@ -248,7 +248,7 @@ int b_alive;
ao_msg(MSGT_AO,MSGL_V, "init([%dHz][%dch][%s][%d])\n", rate, channels, af_fmt2str_short(format), flags);
- ao = calloc(1, sizeof(ao_macosx_t));
+ ao = calloc(1, sizeof(ao_coreaudio_t));
ao->i_selected_dev = 0;
ao->b_supports_digital = 0;
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 0e26e761fa..fc41a73e57 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -32,7 +32,7 @@ ao_data_t ao_data={0,0,0,0,OUTBURST,-1,0};
char *ao_subdevice = NULL;
extern const ao_functions_t audio_out_oss;
-extern const ao_functions_t audio_out_macosx;
+extern const ao_functions_t audio_out_coreaudio;
extern const ao_functions_t audio_out_arts;
extern const ao_functions_t audio_out_esd;
extern const ao_functions_t audio_out_pulse;
@@ -68,7 +68,7 @@ const ao_functions_t* const audio_out_drivers[] =
&audio_out_dart,
#endif
#ifdef CONFIG_COREAUDIO
- &audio_out_macosx,
+ &audio_out_coreaudio,
#endif
#ifdef CONFIG_OSS_AUDIO
&audio_out_oss,