diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-05-04 14:53:47 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-05-04 14:53:47 +0000 |
| commit | e3ec5b1fd377254e19685ddcce0988efda8bffbf (patch) | |
| tree | 8e882e2ae0632fe2db5152f3104bc5c92bfc6a44 /libao2 | |
| parent | 9f45c3a0aeba3670304e598bcf4145a14a684f57 (diff) | |
| download | mpv-e3ec5b1fd377254e19685ddcce0988efda8bffbf.tar.bz2 mpv-e3ec5b1fd377254e19685ddcce0988efda8bffbf.tar.xz | |
Rename macosx audio output driver to coreaudio.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29251 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_coreaudio.c (renamed from libao2/ao_macosx.c) | 16 | ||||
| -rw-r--r-- | libao2/audio_out.c | 4 |
2 files changed, 10 insertions, 10 deletions
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, |