From 1ed117563613b0ddaa2a9c598acc632a707b9cc2 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sat, 13 Jul 2013 11:29:12 +0200 Subject: ao_coreaudio: move utils functions to snake_case --- audio/out/ao_coreaudio.c | 12 +++++----- audio/out/ao_coreaudio_utils.c | 51 +++++++++++++++++++----------------------- audio/out/ao_coreaudio_utils.h | 10 ++++----- 3 files changed, 34 insertions(+), 39 deletions(-) diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 00694943c6..84a5524496 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -308,7 +308,7 @@ static int init(struct ao *ao, char *params) bool supports_digital = false; /* Probe whether device support S/PDIF stream output if input is AC3 stream. */ if (AF_FORMAT_IS_AC3(ao->format)) { - if (AudioDeviceSupportsDigital(selected_device)) + if (ca_device_supports_digital(selected_device)) supports_digital = true; } @@ -580,7 +580,7 @@ static int init_digital(struct ao *ao, AudioStreamBasicDescription asbd) int streams_n = size / sizeof(AudioStreamID); for (int i = 0; i < streams_n && d->stream_idx < 0; i++) { - bool digital = AudioStreamSupportsDigital(streams[i]); + bool digital = ca_stream_supports_digital(streams[i]); if (digital) { /* Find a stream with a cac3 stream. */ @@ -603,7 +603,7 @@ static int init_digital(struct ao *ao, AudioStreamBasicDescription asbd) d->stream_idx = i; for (int j = 0; j < formats_n; j++) - if (AudioFormatIsDigital(formats[j].mFormat)) { + if (ca_format_is_digital(formats[j].mFormat)) { // select the digital format that has exactly the same // samplerate. If an exact match cannot be found, select // the format with highest samplerate as backup. @@ -632,7 +632,7 @@ static int init_digital(struct ao *ao, AudioStreamBasicDescription asbd) goto coreaudio_error; } - if (!AudioStreamChangeFormat(d->stream, d->stream_asbd)) + if (!ca_change_format(d->stream, d->stream_asbd)) goto coreaudio_error; void *changed = (void *) &(d->stream_asbd_changed); @@ -683,8 +683,8 @@ static int play(struct ao *ao, void *output_samples, int num_bytes, int flags) // Check whether we need to reset the digital output stream. if (p->is_digital && d->stream_asbd_changed) { d->stream_asbd_changed = 0; - if (AudioStreamSupportsDigital(d->stream)) { - if (!AudioStreamChangeFormat(d->stream, d->stream_asbd)) { + if (ca_stream_supports_digital(d->stream)) { + if (!ca_change_format(d->stream, d->stream_asbd)) { ca_msg(MSGL_WARN, "can't restore digital output\n"); } else { ca_msg(MSGL_WARN, "restoring digital output succeeded.\n"); diff --git a/audio/out/ao_coreaudio_utils.c b/audio/out/ao_coreaudio_utils.c index bbeaa8bd1c..9a0c184c40 100644 --- a/audio/out/ao_coreaudio_utils.c +++ b/audio/out/ao_coreaudio_utils.c @@ -90,18 +90,18 @@ void ca_print_asbd(const char *description, talloc_free(format); } -int AudioFormatIsDigital(AudioStreamBasicDescription asbd) +bool ca_format_is_digital(AudioStreamBasicDescription asbd) { switch (asbd.mFormatID) case 'IAC3': case 'iac3': case kAudioFormat60958AC3: case kAudioFormatAC3: - return CONTROL_OK; - return CONTROL_FALSE; + return true; + return false; } -int AudioStreamSupportsDigital(AudioStreamID stream) +bool ca_stream_supports_digital(AudioStreamID stream) { AudioStreamRangedDescription *formats = NULL; @@ -113,24 +113,24 @@ int AudioStreamSupportsDigital(AudioStreamID stream) if (!size) { ca_msg(MSGL_WARN, "Could not get number of stream formats.\n"); - return CONTROL_FALSE; + return false; } const int n_formats = size / sizeof(AudioStreamRangedDescription); for (int i = 0; i < n_formats; i++) { AudioStreamBasicDescription asbd = formats[i].mFormat; ca_print_asbd("supported format:", &(asbd)); - if (AudioFormatIsDigital(asbd)) { + if (ca_format_is_digital(asbd)) { free(formats); - return CONTROL_TRUE; + return true; } } free(formats); - return CONTROL_FALSE; + return false; } -int AudioDeviceSupportsDigital(AudioDeviceID device) +bool ca_device_supports_digital(AudioDeviceID device) { AudioStreamID *streams = NULL; @@ -147,14 +147,14 @@ int AudioDeviceSupportsDigital(AudioDeviceID device) const int n_streams = size / sizeof(AudioStreamID); for (int i = 0; i < n_streams; i++) { - if (AudioStreamSupportsDigital(streams[i])) { + if (ca_stream_supports_digital(streams[i])) { free(streams); - return CONTROL_OK; + return true; } } free(streams); - return CONTROL_FALSE; + return false; } OSStatus ca_property_listener(AudioObjectPropertySelector selector, @@ -288,8 +288,8 @@ OSStatus ca_disable_device_listener(AudioDeviceID device, void *flag) { return ca_change_device_listening(device, flag, false); } -int AudioStreamChangeFormat(AudioStreamID i_stream_id, - AudioStreamBasicDescription change_format) +bool ca_change_format(AudioStreamID stream, + AudioStreamBasicDescription change_format) { OSStatus err = noErr; AudioObjectPropertyAddress p_addr; @@ -304,26 +304,23 @@ int AudioStreamChangeFormat(AudioStreamID i_stream_id, .mElement = kAudioObjectPropertyElementMaster, }; - err = AudioObjectAddPropertyListener(i_stream_id, - &p_addr, - ca_stream_listener, + err = AudioObjectAddPropertyListener(stream, &p_addr, ca_stream_listener, (void *)&stream_format_changed); if (!CHECK_CA_WARN("can't add property listener during format change")) { - return CONTROL_FALSE; + return false; } /* Change the format. */ - err = SetAudioProperty(i_stream_id, - kAudioStreamPropertyPhysicalFormat, + err = SetAudioProperty(stream, kAudioStreamPropertyPhysicalFormat, sizeof(AudioStreamBasicDescription), &change_format); if (!CHECK_CA_WARN("error changing physical format")) { - return CONTROL_FALSE; + return false; } /* The AudioStreamSetProperty is not only asynchronious, * it is also not Atomic, in its behaviour. * Therefore we check 5 times before we really give up. */ - bool format_set = CONTROL_FALSE; + bool format_set = false; for (int i = 0; !format_set && i < 5; i++) { for (int j = 0; !stream_format_changed && j < 50; j++) mp_sleep_us(10000); @@ -335,23 +332,21 @@ int AudioStreamChangeFormat(AudioStreamID i_stream_id, } AudioStreamBasicDescription actual_format; - err = CA_GET(i_stream_id, kAudioStreamPropertyPhysicalFormat, &actual_format); + err = CA_GET(stream, kAudioStreamPropertyPhysicalFormat, &actual_format); ca_print_asbd("actual format in use:", &actual_format); if (actual_format.mSampleRate == change_format.mSampleRate && actual_format.mFormatID == change_format.mFormatID && actual_format.mFramesPerPacket == change_format.mFramesPerPacket) { - format_set = CONTROL_TRUE; + format_set = true; } } - err = AudioObjectRemovePropertyListener(i_stream_id, - &p_addr, - ca_stream_listener, + err = AudioObjectRemovePropertyListener(stream, &p_addr, ca_stream_listener, (void *)&stream_format_changed); if (!CHECK_CA_WARN("can't remove property listener")) { - return CONTROL_FALSE; + return false; } return format_set; diff --git a/audio/out/ao_coreaudio_utils.h b/audio/out/ao_coreaudio_utils.h index dd68ed1082..b7f261088b 100644 --- a/audio/out/ao_coreaudio_utils.h +++ b/audio/out/ao_coreaudio_utils.h @@ -43,9 +43,9 @@ bool check_ca_st(int level, OSStatus code, const char *message); void ca_print_asbd(const char *description, const AudioStreamBasicDescription *asbd); -int AudioFormatIsDigital(AudioStreamBasicDescription asbd); -int AudioStreamSupportsDigital(AudioStreamID stream); -int AudioDeviceSupportsDigital(AudioDeviceID device); +bool ca_format_is_digital(AudioStreamBasicDescription asbd); +bool ca_stream_supports_digital(AudioStreamID stream); +bool ca_device_supports_digital(AudioDeviceID device); OSStatus ca_property_listener(AudioObjectPropertySelector selector, AudioObjectID object, uint32_t n_addresses, @@ -67,8 +67,8 @@ OSStatus ca_enable_mixing(AudioDeviceID device, bool changed); OSStatus ca_enable_device_listener(AudioDeviceID device, void *flag); OSStatus ca_disable_device_listener(AudioDeviceID device, void *flag); -int AudioStreamChangeFormat(AudioStreamID i_stream_id, - AudioStreamBasicDescription change_format); +bool ca_change_format(AudioStreamID stream, + AudioStreamBasicDescription change_format); bool ca_bitmap_from_ch_descriptions(AudioChannelLayout layout, uint32_t *bitmap); -- cgit v1.2.3