[vlc-commits] audio_output/coreaudio: Remove check for 10.7

Marvin Scholz git at videolan.org
Thu Jun 21 16:56:51 CEST 2018


vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Wed Feb 14 23:42:50 2018 +0100| [49b28a6658b8eafd1ff360f4513f1a3b78e8997f] | committer: Thomas Guillem

audio_output/coreaudio: Remove check for 10.7

This removes the check if we are running 10.7 or higher and therefore
support 8.0 audio output, as this is always true given the macOS
version we are targeting.

(cherry picked from commit ad17fde5c6753e5ed1b13087db62e3b92561227e)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=49b28a6658b8eafd1ff360f4513f1a3b78e8997f
---

 modules/audio_output/coreaudio_common.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/modules/audio_output/coreaudio_common.c b/modules/audio_output/coreaudio_common.c
index 6444d7c8f0..ef517d65ed 100644
--- a/modules/audio_output/coreaudio_common.c
+++ b/modules/audio_output/coreaudio_common.c
@@ -497,26 +497,6 @@ MapOutputLayout(audio_output_t *p_aout, audio_sample_format_t *fmt,
                 *warn_configuration = true;
         }
 
-        if (aout_FormatNbChannels(fmt) >= 8
-         && fmt->i_physical_channels != AOUT_CHANS_7_1)
-        {
-#if TARGET_OS_IPHONE
-            const bool b_8x_support = true;
-#else
-            SInt32 osx_min_version;
-            if (Gestalt(gestaltSystemVersionMinor, &osx_min_version) != noErr)
-                msg_Err(p_aout, "failed to check OSX version");
-            const bool b_8x_support = osx_min_version >= 7;
-#endif
-
-            if (!b_8x_support)
-            {
-                msg_Warn(p_aout, "8.0 audio output not supported on this "
-                         "device, layout will be incorrect");
-                fmt->i_physical_channels = AOUT_CHANS_7_1;
-            }
-        }
-
     }
 
 end:



More information about the vlc-commits mailing list