s

kasper93 · Nov 23, 2023 · 03937bf · 03937bf
1 parent 358cef9
commit 03937bf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/audio/out/ao_coreaudio_chmap.c b/audio/out/ao_coreaudio_chmap.c
@@ -241,7 +241,9 @@ static AudioChannelLayout* ca_query_stereo_layout(struct ao *ao,
                                                   void *talloc_ctx)
 {
     OSStatus err;
-    const int nch = 2;
+
+#define nch 2
+
     uint32_t channels[nch];
     AudioChannelLayout *r = NULL;
 
@@ -268,6 +270,8 @@ static AudioChannelLayout* ca_query_stereo_layout(struct ao *ao,
         r->mChannelDescriptions[i] = desc;
     }
 
+#undef nch
+
 coreaudio_error:
     return r;
 }

diff --git a/audio/out/ao_coreaudio_utils.c b/audio/out/ao_coreaudio_utils.c
@@ -470,7 +470,7 @@ bool ca_change_physical_format_sync(struct ao *ao, AudioStreamID stream,
 
     ca_print_asbd(ao, "setting stream physical format:", &change_format);
 
-    sem_t wakeup;
+    mp_sem_t wakeup;
     if (mp_sem_init(&wakeup, 0, 0)) {
         MP_WARN(ao, "OOM\n");
         return false;

diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
@@ -292,6 +292,8 @@ -(void)processEvent:(struct mpv_event *)event
         _ctx = nil;
         break;
     }
+    default:
+        break;
     }
 }
 

diff --git a/osdep/macosx_touchbar.m b/osdep/macosx_touchbar.m
@@ -307,6 +307,8 @@ - (void)processEvent:(struct mpv_event *)event
         [self handlePropertyChange:(mpv_event_property *)event->data];
         break;
     }
+    default:
+        break;
     }
 }