Mercurial > mplayer.hg

comparison libao2/ao_coreaudio.c @ 31657:fa6671a1b8dc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some unused variables along with the corresponding warnings.
author diego
date Mon, 12 Jul 2010 17:43:37 +0000
parents 1b5102a113e0
children a05f97bad2a9
comparison
equal deleted inserted replaced
31656:9fb969676b7c 31657:fa6671a1b8dc
350 { 350 {
351 OSStatus err; 351 OSStatus err;
352 UInt32 i_param_size; 352 UInt32 i_param_size;
353 int num_devices; 353 int num_devices;
354 AudioDeviceID *devids; 354 AudioDeviceID *devids;
355 AudioObjectPropertyAddress property_address;
356 char *device_name; 355 char *device_name;
357 356
358 mp_msg(MSGT_AO, MSGL_FATAL, 357 mp_msg(MSGT_AO, MSGL_FATAL,
359 "\n-ao coreaudio commandline help:\n" 358 "\n-ao coreaudio commandline help:\n"
360 "Example: mplayer -ao coreaudio:device_id=266\n" 359 "Example: mplayer -ao coreaudio:device_id=266\n"
396 AudioStreamBasicDescription inDesc; 395 AudioStreamBasicDescription inDesc;
397 ComponentDescription desc; 396 ComponentDescription desc;
398 Component comp; 397 Component comp;
399 AURenderCallbackStruct renderCallback; 398 AURenderCallbackStruct renderCallback;
400 OSStatus err; 399 OSStatus err;
401 UInt32 size, maxFrames, i_param_size, b_alive; 400 UInt32 size, maxFrames, b_alive;
402 char *psz_name; 401 char *psz_name;
403 AudioDeviceID devid_def = 0; 402 AudioDeviceID devid_def = 0;
404 int device_id; 403 int device_id;
405 404
406 const opt_t subopts[] = { 405 const opt_t subopts[] = {
850 /***************************************************************************** 849 /*****************************************************************************
851 * AudioDeviceSupportsDigital: Check i_dev_id for digital stream support. 850 * AudioDeviceSupportsDigital: Check i_dev_id for digital stream support.
852 *****************************************************************************/ 851 *****************************************************************************/
853 static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id ) 852 static int AudioDeviceSupportsDigital( AudioDeviceID i_dev_id )
854 { 853 {
855 OSStatus err = noErr;
856 UInt32 i_param_size = 0; 854 UInt32 i_param_size = 0;
857 AudioStreamID *p_streams = NULL; 855 AudioStreamID *p_streams = NULL;
858 int i = 0, i_streams = 0; 856 int i = 0, i_streams = 0;
859 int b_return = CONTROL_FALSE; 857 int b_return = CONTROL_FALSE;
860 858
884 /***************************************************************************** 882 /*****************************************************************************
885 * AudioStreamSupportsDigital: Check i_stream_id for digital stream support. 883 * AudioStreamSupportsDigital: Check i_stream_id for digital stream support.
886 *****************************************************************************/ 884 *****************************************************************************/
887 static int AudioStreamSupportsDigital( AudioStreamID i_stream_id ) 885 static int AudioStreamSupportsDigital( AudioStreamID i_stream_id )
888 { 886 {
889 OSStatus err = noErr;
890 UInt32 i_param_size; 887 UInt32 i_param_size;
891 AudioStreamBasicDescription *p_format_list = NULL; 888 AudioStreamBasicDescription *p_format_list = NULL;
892 int i, i_formats, b_return = CONTROL_FALSE; 889 int i, i_formats, b_return = CONTROL_FALSE;
893 890
894 /* Retrieve all the stream formats supported by each output stream. */ 891 /* Retrieve all the stream formats supported by each output stream. */
1086 1083
1087 /* unload plugin and deregister from coreaudio */ 1084 /* unload plugin and deregister from coreaudio */
1088 static void uninit(int immed) 1085 static void uninit(int immed)
1089 { 1086 {
1090 OSStatus err = noErr; 1087 OSStatus err = noErr;
1091 UInt32 i_param_size = 0;
1092 1088
1093 if (!immed) { 1089 if (!immed) {
1094 long long timeleft=(1000000LL*av_fifo_size(ao->buffer))/ao_data.bps; 1090 long long timeleft=(1000000LL*av_fifo_size(ao->buffer))/ao_data.bps;
1095 ao_msg(MSGT_AO,MSGL_DBG2, "%d bytes left @%d bps (%d usec)\n", av_fifo_size(ao->buffer), ao_data.bps, (int)timeleft); 1091 ao_msg(MSGT_AO,MSGL_DBG2, "%d bytes left @%d bps (%d usec)\n", av_fifo_size(ao->buffer), ao_data.bps, (int)timeleft);
1096 usec_sleep((int)timeleft); 1092 usec_sleep((int)timeleft);