Ver código fonte

playback controller: rename headphone method as it covers all external audio playback devices now

Felix Paul Kühne 6 anos atrás
pai
commit
39fcf37a7c
1 arquivos alterados com 9 adições e 9 exclusões
  1. 9 9
      Sources/VLCPlaybackController.m

+ 9 - 9
Sources/VLCPlaybackController.m

@@ -2,7 +2,7 @@
  * VLCPlaybackController.m
  * VLC for iOS
  *****************************************************************************
- * Copyright (c) 2013-2015 VideoLAN. All rights reserved.
+ * Copyright (c) 2013-2018 VideoLAN. All rights reserved.
  * $Id$
  *
  * Authors: Felix Paul Kühne <fkuehne # videolan.org>
@@ -66,7 +66,7 @@ typedef NS_ENUM(NSUInteger, VLCAspectRatio) {
     BOOL _needsMetadataUpdate;
     BOOL _mediaWasJustStarted;
     BOOL _recheckForExistingThumbnail;
-    BOOL _headphonesWasPlugged;
+    BOOL _externalAudioPlaybackDevicePlugged;
 
     NSLock *_playbackSessionManagementLock;
 
@@ -102,7 +102,7 @@ typedef NS_ENUM(NSUInteger, VLCAspectRatio) {
     self = [super init];
     if (self) {
         // listen to audiosessions and appkit callback
-        _headphonesWasPlugged = [self areHeadphonesPlugged];
+        _externalAudioPlaybackDevicePlugged = [self isExternalAudioPlaybackDevicePlugged];
         NSNotificationCenter *defaultCenter = [NSNotificationCenter defaultCenter];
         [defaultCenter addObserver:self selector:@selector(audioSessionRouteChange:)
                               name:AVAudioSessionRouteChangeNotification object:nil];
@@ -1103,10 +1103,10 @@ typedef NS_ENUM(NSUInteger, VLCAspectRatio) {
     }
 }
 
-- (BOOL)areHeadphonesPlugged
+- (BOOL)isExternalAudioPlaybackDevicePlugged
 {
     /* check what output device is currently connected
-     * this code assumes that everything which is not a builtin speaker, is some sort of headphone */
+     * this code assumes that everything which is not a builtin speaker, must be external */
     NSArray *outputs = [[AVAudioSession sharedInstance] currentRoute].outputs;
     AVAudioSessionPortDescription *outputDescription = outputs.firstObject;
     return ![outputDescription.portType isEqualToString:AVAudioSessionPortBuiltInSpeaker];
@@ -1120,17 +1120,17 @@ typedef NS_ENUM(NSUInteger, VLCAspectRatio) {
     if (routeChangeReason == AVAudioSessionRouteChangeReasonRouteConfigurationChange)
         return;
 
-    BOOL headphonesPlugged = [self areHeadphonesPlugged];
+    BOOL externalAudioPlaybackDevicePlugged = [self isExternalAudioPlaybackDevicePlugged];
 
-    if (_headphonesWasPlugged && !headphonesPlugged && [_mediaPlayer isPlaying]) {
-        APLog(@"Pausing playback as previously plugged headphones were removed");
+    if (_externalAudioPlaybackDevicePlugged && !externalAudioPlaybackDevicePlugged && [_mediaPlayer isPlaying]) {
+        APLog(@"Pausing playback as previously plugged external audio playback device was removed");
         [_mediaPlayer pause];
 #if TARGET_OS_IOS
         [self _savePlaybackState];
 #endif
         [[NSNotificationCenter defaultCenter] postNotificationName:VLCPlaybackControllerPlaybackDidPause object:self];
     }
-    _headphonesWasPlugged = headphonesPlugged;
+    _externalAudioPlaybackDevicePlugged = externalAudioPlaybackDevicePlugged;
 }
 
 #pragma mark - Managing the media item