From d450b1cac12b02ef83417abee7ee5b1d32de25db Mon Sep 17 00:00:00 2001 From: Ilya Konstantinov Date: Mon, 9 Mar 2015 22:51:51 +0200 Subject: [PATCH] osxaudio: rename gst_core_audio_set_channels_layout() to gst_core_audio_get_channel_layout(). --- sys/osxaudio/gstosxcoreaudiocommon.c | 2 +- sys/osxaudio/gstosxcoreaudiocommon.h | 2 +- sys/osxaudio/gstosxcoreaudiohal.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/osxaudio/gstosxcoreaudiocommon.c b/sys/osxaudio/gstosxcoreaudiocommon.c index 4484431417..0b9e892fe7 100644 --- a/sys/osxaudio/gstosxcoreaudiocommon.c +++ b/sys/osxaudio/gstosxcoreaudiocommon.c @@ -214,7 +214,7 @@ audiounit_error: } gboolean -gst_core_audio_set_channels_layout (GstCoreAudio * core_audio, +gst_core_audio_set_channel_layout (GstCoreAudio * core_audio, gint channels, GstCaps * caps) { /* Configure the output stream and allocate ringbuffer memory */ diff --git a/sys/osxaudio/gstosxcoreaudiocommon.h b/sys/osxaudio/gstosxcoreaudiocommon.h index 228a1646fd..8e7936ac3b 100644 --- a/sys/osxaudio/gstosxcoreaudiocommon.h +++ b/sys/osxaudio/gstosxcoreaudiocommon.h @@ -47,7 +47,7 @@ void buffer_list_free (AudioBufferList * lis gboolean gst_core_audio_set_format (GstCoreAudio * core_audio, AudioStreamBasicDescription format); -gboolean gst_core_audio_set_channels_layout (GstCoreAudio * core_audio, +gboolean gst_core_audio_set_channel_layout (GstCoreAudio * core_audio, gint channels, GstCaps * caps); gboolean gst_core_audio_open_device (GstCoreAudio *core_audio, diff --git a/sys/osxaudio/gstosxcoreaudiohal.c b/sys/osxaudio/gstosxcoreaudiohal.c index 925355ac51..f1ebdf5d38 100644 --- a/sys/osxaudio/gstosxcoreaudiohal.c +++ b/sys/osxaudio/gstosxcoreaudiohal.c @@ -1135,7 +1135,7 @@ gst_core_audio_initialize_impl (GstCoreAudio * core_audio, if (!gst_core_audio_set_format (core_audio, format)) goto done; - if (!gst_core_audio_set_channels_layout (core_audio, + if (!gst_core_audio_set_channel_layout (core_audio, format.mChannelsPerFrame, caps)) goto done;