summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Pang <athp@users.sourceforge.net>2004-07-05 01:24:16 +0000
committerAndre Pang <athp@users.sourceforge.net>2004-07-05 01:24:16 +0000
commit06accd34019f620347881096405b12dff1361f59 (patch)
treedcb44e121de9acdaecd7dc7551cda6ef8233a2ec
parent0a560b285ff7d692d6c01f9ef4d89bb16665ccfd (diff)
downloadxine-lib-06accd34019f620347881096405b12dff1361f59.tar.gz
xine-lib-06accd34019f620347881096405b12dff1361f59.tar.bz2
Change "MacOSX" -> "Mac OS X" for human-readable strings (still use MacOSX
internally) CVS patchset: 6771 CVS date: 2004/07/05 01:24:16
-rw-r--r--AUTHORS4
-rw-r--r--configure.ac14
-rw-r--r--src/audio_out/audio_coreaudio_out.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/AUTHORS b/AUTHORS
index 98762bc65..4b7d32526 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -490,10 +490,10 @@ Vincent Pelletier <subdino2004@yahoo.fr>
Word wrap and other improvements in libsputext.
Daniel Mack <xine@zonque.org>
- native MacOSX video and audio output plugins
+ native Mac OS X video and audio output plugins
André Pang <ozone@algorithm.com.au>
- MacOSX fixes and framework/frontend work
+ Mac OS X fixes and framework/frontend work
Stefan Kristiansson <stefan@langante.mine.nu>
moved Xv initialization from class to plugin context
diff --git a/configure.ac b/configure.ac
index 6af7a097a..b6ed2a5d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,18 +658,18 @@ AC_ARG_ENABLE(fb, AC_HELP_STRING([--disable-fb], [do not build linux framebuffer
AM_CONDITIONAL(HAVE_FB, [test x"$have_fb" = "xyes"])
dnl ---------------------------------------------
-dnl Check whether to build MacOSX video output driver
+dnl Check whether to build Mac OS X video output driver
dnl ---------------------------------------------
-AC_ARG_ENABLE(macosx_video, AC_HELP_STRING([--enable-macosx-video], [enable support for MacOSX OpenGL video output]),
+AC_ARG_ENABLE(macosx_video, AC_HELP_STRING([--enable-macosx-video], [enable support for Mac OS X OpenGL video output]),
have_macosx_video=$enableval)
AM_CONDITIONAL(HAVE_MACOSX_VIDEO, [test x"$have_macosx_video" = "xyes"])
dnl ---------------------------------------------
-dnl Check whether to build MacOSX audio output driver
+dnl Check whether to build Mac OS X audio output driver
dnl ---------------------------------------------
-AC_ARG_ENABLE(coreaudio, AC_HELP_STRING([--enable-coreaudio], [enable support for MacOSX Coreaudio output]),
+AC_ARG_ENABLE(coreaudio, AC_HELP_STRING([--enable-coreaudio], [enable support for Mac OS X Coreaudio output]),
have_coreaudio=$enableval)
AM_CONDITIONAL(HAVE_COREAUDIO, [test x"$have_coreaudio" = "xyes"])
@@ -1616,7 +1616,7 @@ case "$host_or_hostalias" in
;;
*darwin*)
- AC_DEFINE_UNQUOTED(HOST_OS_DARWIN, 1, [Define this if built on MacOSX/Darwin])
+ AC_DEFINE_UNQUOTED(HOST_OS_DARWIN, 1, [Define this if built on Mac OS X/Darwin])
CFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions -no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
@@ -2359,7 +2359,7 @@ if test x"$have_directx" = "xyes"; then
echo " - directx (DirectX video driver)"
fi
if test x"$have_macosx_video" = "xyes"; then
- echo " - MacOSX OpenGL"
+ echo " - Mac OS X OpenGL"
fi
echo ""
@@ -2390,7 +2390,7 @@ if test x"$have_directx" = "xyes"; then
echo " - directx (DirectX audio driver)"
fi
if test x"$have_coreaudio" = "xyes"; then
- echo " - CoreAudio (MacOSX audio driver)"
+ echo " - CoreAudio (Mac OS X audio driver)"
fi
echo "---"
diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c
index 680e7db84..6038af349 100644
--- a/src/audio_out/audio_coreaudio_out.c
+++ b/src/audio_out/audio_coreaudio_out.c
@@ -449,7 +449,7 @@ static char* get_identifier (audio_driver_class_t *this_gen) {
}
static char* get_description (audio_driver_class_t *this_gen) {
- return _("xine output plugin for Coreaudio/MacOSX");
+ return _("xine output plugin for Coreaudio/Mac OS X");
}
static void dispose_class (audio_driver_class_t *this_gen) {