浏览代码

VLCPlaybackController: Add nullablility

(cherry picked from commit d5fcf4a278d75ffd32ec8d34c4ff9ddf8438344c)
Carola Nitz 7 年之前
父节点
当前提交
5db48e529a

+ 5 - 2
Sources/VLCPlaybackController.h

@@ -12,7 +12,9 @@
  *****************************************************************************/
 
 #import "VLCEqualizerView.h"
-extern NSString *const VLCPlaybackControllerPlaybackDidStart;
+
+NS_ASSUME_NONNULL_BEGIN
+extern NSString * const VLCPlaybackControllerPlaybackDidStart;
 extern NSString *const VLCPlaybackControllerPlaybackDidPause;
 extern NSString *const VLCPlaybackControllerPlaybackDidResume;
 extern NSString *const VLCPlaybackControllerPlaybackDidStop;
@@ -92,7 +94,7 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 @property (nonatomic, readonly) NSDictionary *mediaOptionsDictionary;
 @property (nonatomic, readonly) NSTimer *sleepTimer;
 
-@property (nonatomic) VLCRendererItem *renderer;
+@property (nonatomic) VLCRendererItem * _Nullable renderer;
 
 + (VLCPlaybackController *)sharedInstance;
 - (VLCTime *)playedTime;
@@ -135,4 +137,5 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 - (void)playMediaList:(VLCMediaList *)mediaList firstIndex:(NSInteger)index subtitlesFilePath:(NSString *)subsFilePath;
 - (void)openVideoSubTitlesFromFile:(NSString *)pathToFile;
 
+NS_ASSUME_NONNULL_END
 @end

+ 1 - 1
Sources/VLCPlaybackController.m

@@ -1349,7 +1349,7 @@ typedef NS_ENUM(NSUInteger, VLCAspectRatio) {
 }
 
 #pragma mark - Renderer
-- (void)setRenderer:(VLCRendererItem *)renderer
+- (void)setRenderer:(VLCRendererItem * __nullable)renderer
 {
     _renderer = renderer;
     [_mediaPlayer setRendererItem:_renderer];

+ 12 - 14
Sources/VLCRendererDiscovererManager.swift

@@ -163,22 +163,20 @@ extension VLCRendererDiscovererManager: VLCRendererDiscovererDelegate {
     }
 
     func rendererDiscovererItemDeleted(_ rendererDiscoverer: VLCRendererDiscoverer, item: VLCRendererItem) {
-        if let playbackController = VLCPlaybackController.sharedInstance() {
-            // Current renderer has been removed
-            if playbackController.renderer == item {
-                playbackController.renderer = nil
-                delegate?.removedCurrentRendererItem?(item)
-                // Reset buttons state
-                for button in rendererButtons {
-                    button.isSelected = false
-                }
-            }
-            if actionSheet.viewIfLoaded?.window != nil {
-                actionSheet.collectionView.reloadData()
-                actionSheet.updateViewConstraints()
+        let playbackController = VLCPlaybackController.sharedInstance()
+        // Current renderer has been removed
+        if playbackController.renderer == item {
+            playbackController.renderer = nil
+            delegate?.removedCurrentRendererItem?(item)
+            // Reset buttons state
+            for button in rendererButtons {
+                button.isSelected = false
             }
         }
-
+        if actionSheet.viewIfLoaded?.window != nil {
+            actionSheet.collectionView.reloadData()
+            actionSheet.updateViewConstraints()
+        }
         // No more renderers to show
         if getAllRenderers().isEmpty {
             for button in rendererButtons {

+ 1 - 1
Sources/VLCTabBarCoordinator.swift

@@ -105,6 +105,6 @@ class VLCTabbarCooordinator: NSObject, VLCMediaCategoryViewControllerDelegate {
     func playMedia(media: NSManagedObject) {
         //that should go into a Coordinator itself
         let vpc = VLCPlaybackController.sharedInstance()
-        vpc?.playMediaLibraryObject(media)
+        vpc.playMediaLibraryObject(media)
     }
 }