mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

osxaudio: adjust for changes to glib mutex api.

Browse source
This commit is contained in:
Todd Agulnick 2013-04-12 11:51:46 -07:00 committed by Sebastian Dröge
parent 09e980d2c9
commit ed94ef79f9
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sys/osxaudio/gstosxcoreaudiocommon.h
View file

@ -30,8 +30,8 @@
typedef struct typedef struct
{ {
GMutex *lock; GMutex lock;
GCond *cond; GCond cond;
} PropertyMutex; } PropertyMutex;
gboolean gst_core_audio_bind_device (GstCoreAudio *core_audio); gboolean gst_core_audio_bind_device (GstCoreAudio *core_audio);

20
sys/osxaudio/gstosxcoreaudiohal.c
View file

@ -567,9 +567,9 @@ _audio_stream_format_listener (AudioObjectID inObjectID,
for (i = 0; i < inNumberAddresses; i++) { for (i = 0; i < inNumberAddresses; i++) {
if (inAddresses[i].mSelector == kAudioStreamPropertyPhysicalFormat) { if (inAddresses[i].mSelector == kAudioStreamPropertyPhysicalFormat) {
g_mutex_lock (prop_mutex->lock); g_mutex_lock (&prop_mutex->lock);
g_cond_signal (prop_mutex->cond); g_cond_signal (&prop_mutex->cond);
g_mutex_unlock (prop_mutex->lock); g_mutex_unlock (&prop_mutex->lock);
break; break;
} }
} }
@ -596,10 +596,10 @@ _audio_stream_change_format (AudioStreamID stream_id,
CORE_AUDIO_FORMAT_ARGS (format)); CORE_AUDIO_FORMAT_ARGS (format));
/* Condition because SetProperty is asynchronous */ /* Condition because SetProperty is asynchronous */
prop_mutex.lock = g_mutex_new (); g_mutex_init (&prop_mutex.lock);
prop_mutex.cond = g_cond_new (); g_cond_init (&prop_mutex.cond);
g_mutex_lock (prop_mutex.lock); g_mutex_lock (&prop_mutex.lock);
/* Install the property listener to serialize the operations */ /* Install the property listener to serialize the operations */
status = AudioObjectAddPropertyListener (stream_id, &formatAddress, status = AudioObjectAddPropertyListener (stream_id, &formatAddress,
@ -624,7 +624,7 @@ _audio_stream_change_format (AudioStreamID stream_id,
g_get_current_time (&timeout); g_get_current_time (&timeout);
g_time_val_add (&timeout, 250000); g_time_val_add (&timeout, 250000);
if (!g_cond_timed_wait (prop_mutex.cond, prop_mutex.lock, &timeout)) { if (!g_cond_wait_until (&prop_mutex.cond, &prop_mutex.lock, timeout.tv_sec)) {
GST_LOG ("timeout..."); GST_LOG ("timeout...");
} }
@ -658,9 +658,9 @@ done:
GST_FOURCC_FORMAT, GST_FOURCC_ARGS (status)); GST_FOURCC_FORMAT, GST_FOURCC_ARGS (status));
} }
/* Destroy the lock and condition */ /* Destroy the lock and condition */
g_mutex_unlock (prop_mutex.lock); g_mutex_unlock (&prop_mutex.lock);
g_mutex_free (prop_mutex.lock); g_mutex_clear (&prop_mutex.lock);
g_cond_free (prop_mutex.cond); g_cond_clear (&prop_mutex.cond);
return ret; return ret;
} }