ao_audiounit: add --audio-exclusiv support, make non-exclusive default

Callum Moffat committed 1 year ago

Commit 748fc2b1 parent 11dcd443 files · +9 −3Browse files

Unified · Split

3 files

@@ -0,0 +1 @@
		1	add --audio-exclusive option support for ao=audiounit and make non-exclusive the new default

@@ -2001,8 +2001,8 @@ Audio · 2000 unmodified lines
2001	Enable exclusive output mode. In this mode, the system is usually locked	2001	Enable exclusive output mode. In this mode, the system is usually locked
2002	out, and only mpv will be able to output audio.	2002	out, and only mpv will be able to output audio.
2003		2003
2004	This only works for some audio outputs, such as ``wasapi``, ``coreaudio``	2004	This only works for some audio outputs, such as ``wasapi``, ``coreaudio``,
2005	and ``pipewire``. Other audio outputs silently ignore this option.	2005	``pipewire`` and ``audiounit``. Other audio outputs silently ignore this option.
2006	They either have no concept of exclusive mode, or the mpv side of the	2006	They either have no concept of exclusive mode, or the mpv side of the
2007	implementation is missing.	2007	implementation is missing.
2008		2008

     MP_VERBOSE(ao, "max channels: %ld, requested: %d\n", maxChannels, (int)ao->channels.num);
-    [instance setCategory:AVAudioSessionCategoryPlayback error:nil];
+    AVAudioSessionCategoryOptions options = 0;
+    if (!(ao->init_flags & AO_INIT_EXCLUSIVE)) {
+        options |= AVAudioSessionCategoryOptionMixWithOthers;
+    }
+    [instance setCategory:AVAudioSessionCategoryPlayback withOptions:options error:nil];
     [instance setMode:AVAudioSessionModeMoviePlayback error:nil];
     [instance setActive:YES error:nil];
     [instance setPreferredOutputNumberOfChannels:prefChannels error:nil];

Keyboard shortcuts