osdep: remove semaphore-mac

It is only used in one place in ao_coreaudio_utils.c,
and can be replaced by condvar.
Removing it can reduce the maintenance burden.

audio/out/ao_coreaudio.c

@@ -34,6 +34,9 @@
 #define IDLE_TIME 7 * NSEC_PER_SEC
 
 struct priv {
+    // This must be put in the front
+    struct coreaudio_cb_sem sem;
+
     AudioDeviceID device;
     AudioUnit audio_unit;
 
@@ -543,6 +546,12 @@ const struct ao_driver audio_out_coreaudio = {
     .hotplug_uninit = hotplug_uninit,
     .list_devs      = ca_get_device_list,
     .priv_size      = sizeof(struct priv),
+    .priv_defaults  = &(const struct priv){
+        .sem = (struct coreaudio_cb_sem){
+            .mutex = MP_STATIC_MUTEX_INITIALIZER,
+            .cond = MP_STATIC_COND_INITIALIZER,
+        }
+    },
     .options = (const struct m_option[]){
         {"change-physical-format", OPT_BOOL(change_physical_format)},
         {0}

audio/out/ao_coreaudio_exclusive.c

@@ -52,6 +52,9 @@
 #include "audio/out/ao_coreaudio_utils.h"
 
 struct priv {
+    // This must be put in the front
+    struct coreaudio_cb_sem sem;
+
     AudioDeviceID device;   // selected device
 
     bool paused;
@@ -459,6 +462,10 @@ const struct ao_driver audio_out_coreaudio_exclusive = {
     .list_devs = ca_get_device_list,
     .priv_size = sizeof(struct priv),
     .priv_defaults = &(const struct priv){
+        .sem = (struct coreaudio_cb_sem){
+            .mutex = MP_STATIC_MUTEX_INITIALIZER,
+            .cond = MP_STATIC_COND_INITIALIZER,
+        },
         .hog_pid = -1,
         .stream = 0,
         .stream_idx = -1,

audio/out/ao_coreaudio_utils.c

@@ -25,7 +25,6 @@
 #include "audio/out/ao_coreaudio_utils.h"
 #include "osdep/timer.h"
 #include "osdep/endian.h"
-#include "osdep/semaphore.h"
 #include "audio/format.h"
 
 #if HAVE_COREAUDIO || HAVE_AVFOUNDATION
@@ -460,23 +459,23 @@ static OSStatus ca_change_format_listener(
     const AudioObjectPropertyAddress addresses[],
     void *data)
 {
-    mp_sem_t *sem = data;
-    mp_sem_post(sem);
+    struct coreaudio_cb_sem *sem = data;
+    mp_mutex_lock(&sem->mutex);
+    mp_cond_broadcast(&sem->cond);
+    mp_mutex_unlock(&sem->mutex);
     return noErr;
 }
 
 bool ca_change_physical_format_sync(struct ao *ao, AudioStreamID stream,
                                     AudioStreamBasicDescription change_format)
 {
+    struct coreaudio_cb_sem *sem = ao->priv;
+
     OSStatus err = noErr;
     bool format_set = false;
 
     ca_print_asbd(ao, "setting stream physical format:", &change_format);
 
-    mp_sem_t wakeup;
-    if (mp_sem_init(&wakeup, 0, 0))
-        MP_HANDLE_OOM(0);
-
     AudioStreamBasicDescription prev_format;
     err = CA_GET(stream, kAudioStreamPropertyPhysicalFormat, &prev_format);
     CHECK_CA_ERROR("can't get current physical format");
@@ -492,9 +491,11 @@ bool ca_change_physical_format_sync(struct ao *ao, AudioStreamID stream,
 
     err = AudioObjectAddPropertyListener(stream, &p_addr,
                                          ca_change_format_listener,
-                                         &wakeup);
+                                         sem);
     CHECK_CA_ERROR("can't add property listener during format change");
 
+    mp_mutex_lock(&sem->mutex);
+
     /* Change the format. */
     err = CA_SET(stream, kAudioStreamPropertyPhysicalFormat, &change_format);
     CHECK_CA_WARN("error changing physical format");
@@ -512,12 +513,14 @@ bool ca_change_physical_format_sync(struct ao *ao, AudioStreamID stream,
         if (format_set)
             break;
 
-        if (mp_sem_timedwait(&wakeup, wait_until)) {
+        if (mp_cond_timedwait_until(&sem->cond, &sem->mutex, wait_until)) {
             MP_VERBOSE(ao, "reached timeout\n");
             break;
         }
     }
 
+    mp_mutex_unlock(&sem->mutex);
+
     ca_print_asbd(ao, "actual format in use:", &actual_format);
 
     if (!format_set) {
@@ -530,11 +533,10 @@ bool ca_change_physical_format_sync(struct ao *ao, AudioStreamID stream,
 
     err = AudioObjectRemovePropertyListener(stream, &p_addr,
                                             ca_change_format_listener,
-                                            &wakeup);
+                                            sem);
     CHECK_CA_ERROR("can't remove property listener");
 
 coreaudio_error:
-    mp_sem_destroy(&wakeup);
     return format_set;
 }
 #endif

audio/out/ao_coreaudio_utils.h

@@ -28,6 +28,12 @@
 #include "audio/out/ao.h"
 #include "internal.h"
 #include "osdep/utils-mac.h"
+#include "osdep/threads.h"
+
+struct coreaudio_cb_sem {
+    mp_mutex mutex;
+    mp_cond cond;
+};
 
 bool check_ca_st(struct ao *ao, int level, OSStatus code, const char *message);
 

meson.build

@@ -251,7 +251,6 @@ sources = files(
 
     ## osdep
     'osdep/io.c',
-    'osdep/semaphore-mac.c',
     'osdep/subprocess.c',
     'osdep/timer.c',