Skip to content

GitLab

Commit eecd44e9 authored by Carola's avatar Carola
Browse files
Options

Replace setting the passthrough via private Api with now exposed property

parent 397f2cf3
Pipeline #93 failed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 14 additions and 17 deletions
    Apple-TV/Playback/Playback Info/VLCPlaybackInfoTracksTVViewController.m
    View file @ eecd44e9
    ......@@ -135,11 +135,7 @@
    if (row >= audioTrackIndexes.count) {
    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
    BOOL bValue = ![defaults boolForKey:kVLCSettingUseSPDIF];
    /* we are using private API of VLCKit here, nothing to warning about */
    #pragma clang diagnostic push
    #pragma clang diagnostic ignored "-Wundeclared-selector"
    [[VLCPlaybackController sharedInstance].mediaPlayer performSelector:@selector(setPassthroughAudio:) withObject:@(bValue)];
    #pragma clang diagnostic pop
    self.mediaPlayer.audio.passthrough = bValue;
    [defaults setBool:bValue forKey:kVLCSettingUseSPDIF];
    [defaults synchronize];
    ......
    Podfile.lock
    View file @ eecd44e9
    ......@@ -140,6 +140,6 @@ SPEC CHECKSUMS:
    XKKeychain: 852ef663c56a7194c73d3c68e8d9d4f07b121d4f
    xmlrpc: 109bb21d15ed6d108b2c1ac5973a6a223a50f5f4
    PODFILE CHECKSUM: e177d3eb55ad781611e51f09ccc4274ee9add588
    PODFILE CHECKSUM: d7146d68324a0b3d080277da68444f3a6b0cf59d
    COCOAPODS: 1.3.1
    COCOAPODS: 1.2.1
    Sources/VLCPlaybackController.m
    View file @ eecd44e9
    ......@@ -528,8 +528,9 @@ VLCMediaDelegate>
    #else
    NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
    BOOL bValue = [defaults boolForKey:kVLCSettingUseSPDIF];
    if (bValue) {
    [_mediaPlayer performSelector:@selector(setPassthroughAudio:) withObject:@(bValue)];
    _mediaPlayer.audio.passthrough = bValue;
    }
    #endif
    }
    ......
    VLC.xcodeproj/project.pbxproj
    View file @ eecd44e9
    ......@@ -3885,7 +3885,7 @@
    );
    runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh;
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0;
    };
    41F7087C1F37900A00953630 /* ShellScript */ = {
    ......@@ -3957,7 +3957,7 @@
    );
    runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh;
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0;
    };
    70B91CB914052D9EA124AEC3 /* [CP] Embed Pods Frameworks */ = {
    ......@@ -3982,7 +3982,7 @@
    );
    inputPaths = (
    "${SRCROOT}/Pods/Target Support Files/Pods-VLC-iOS-no-watch-Debug/Pods-VLC-iOS-no-watch-Debug-resources.sh",
    $PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle,
    "$PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle",
    "${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/Base.lproj",
    "${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/de.lproj",
    "${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/el.lproj",
    ......@@ -4027,7 +4027,7 @@
    );
    runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh;
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0;
    };
    7D63BC141D414212003C60D3 /* [CP] Embed Pods Frameworks */ = {
    ......@@ -4072,7 +4072,7 @@
    );
    inputPaths = (
    "${SRCROOT}/Pods/Target Support Files/Pods-VLC-iOS/Pods-VLC-iOS-resources.sh",
    $PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle,
    "$PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle",
    "${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/Base.lproj",
    "${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/de.lproj",
    "${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/el.lproj",
    ......@@ -4119,7 +4119,7 @@
    );
    runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh;
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0;
    };
    A2A77B2E8117AEB87124DCCA /* [CP] Embed Pods Frameworks */ = {
    ......@@ -4167,7 +4167,7 @@
    );
    runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh;
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0;
    };
    D5E71C917AC0F153A13E1C49 /* [CP] Copy Pods Resources */ = {
    ......@@ -4177,7 +4177,7 @@
    );
    inputPaths = (
    "${SRCROOT}/Pods/Target Support Files/Pods-VLC-iOS-no-watch/Pods-VLC-iOS-no-watch-resources.sh",
    $PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle,
    "$PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle",
    "${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/Base.lproj",
    "${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/de.lproj",
    "${PODS_ROOT}/InAppSettingsKit/InAppSettingsKit/Resources/el.lproj",
    ......@@ -4243,7 +4243,7 @@
    );
    runOnlyForDeploymentPostprocessing = 0;
    shellPath = /bin/sh;
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
    shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
    showEnvVarsInLog = 0;
    };
    /* End PBXShellScriptBuildPhase section */
    ......
    Markdown is supported
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment