Browse Source

VLCPlayerDisplayController: remove not used PlaybackController from showStatusMessage call

add nullability to outputview
Carola Nitz 7 years ago
parent
commit
3a9a994772

+ 1 - 1
Sources/VLCMovieViewController.m

@@ -1090,7 +1090,7 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
     _multiSelectionView.mediaHasChapters = currentMediaHasChapters;
 }
 
-- (void)showStatusMessage:(NSString *)statusMessage forPlaybackController:(VLCPlaybackController *)controller
+- (void)showStatusMessage:(NSString *)statusMessage
 {
     [self.statusLabel showStatusMessage:statusMessage];
 }

+ 5 - 5
Sources/VLCPlaybackController.h

@@ -35,14 +35,14 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
         currentMediaHasChapters:(BOOL)currentMediaHasChapters
           forPlaybackController:(VLCPlaybackController *)controller;
 - (void)prepareForMediaPlayback:(VLCPlaybackController *)controller;
-- (void)showStatusMessage:(NSString *)statusMessage forPlaybackController:(VLCPlaybackController *)controller;
+- (void)showStatusMessage:(NSString *)statusMessage;
 - (void)displayMetadataForPlaybackController:(VLCPlaybackController *)controller metadata:(VLCMetaData *)metadata;
 
 @end
 
 @interface VLCPlaybackController : NSObject <VLCEqualizerViewDelegate>
 
-@property (nonatomic, strong) UIView *videoOutputView;
+@property (nonatomic, strong, nullable) UIView *videoOutputView;
 
 @property (nonatomic, retain) VLCMediaList *mediaList;
 
@@ -93,7 +93,7 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 @property (nonatomic, readonly) NSTimer *sleepTimer;
 @property (nonatomic, readonly) VLCDialogProvider *dialogProvider;
 
-@property (nonatomic) VLCRendererItem * _Nullable renderer;
+@property (nonatomic, nullable) VLCRendererItem *renderer;
 
 + (VLCPlaybackController *)sharedInstance;
 - (VLCTime *)playedTime;
@@ -133,8 +133,8 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 - (void)setNeedsMetadataUpdate;
 - (void)scheduleSleepTimerWithInterval:(NSTimeInterval)timeInterval;
 - (void)performNavigationAction:(VLCMediaPlaybackNavigationAction)action;
-- (void)playMediaList:(VLCMediaList *)mediaList firstIndex:(NSInteger)index subtitlesFilePath:(NSString * _Nullable)subsFilePath;
-- (void)playMediaList:(VLCMediaList *)mediaList firstIndex:(NSInteger)index subtitlesFilePath:(NSString * _Nullable)subsFilePath completion:(void (^ __nullable)(BOOL success))completion;
+- (void)playMediaList:(VLCMediaList *)mediaList firstIndex:(NSInteger)index subtitlesFilePath:(nullable NSString *)subsFilePath;
+- (void)playMediaList:(VLCMediaList *)mediaList firstIndex:(NSInteger)index subtitlesFilePath:(nullable NSString *)subsFilePath completion:(void (^ __nullable)(BOOL success))completion;
 - (void)openVideoSubTitlesFromFile:(NSString *)pathToFile;
 
 NS_ASSUME_NONNULL_END

+ 2 - 2
Sources/VLCPlaybackController.m

@@ -919,8 +919,8 @@ typedef NS_ENUM(NSUInteger, VLCAspectRatio) {
             _mediaPlayer.videoAspectRatio = (char *)[[self stringForAspectRatio:_currentAspectRatio] UTF8String];
     }
 
-    if ([self.delegate respondsToSelector:@selector(showStatusMessage:forPlaybackController:)]) {
-        [self.delegate showStatusMessage:[NSString stringWithFormat:NSLocalizedString(@"AR_CHANGED", nil), [self stringForAspectRatio:_currentAspectRatio]] forPlaybackController:self];
+    if ([self.delegate respondsToSelector:@selector(showStatusMessage:)]) {
+        [self.delegate showStatusMessage:[NSString stringWithFormat:NSLocalizedString(@"AR_CHANGED", nil), [self stringForAspectRatio:_currentAspectRatio]]];
     }
 }
 

+ 2 - 2
Sources/VLCPlayerDisplayController.m

@@ -190,8 +190,8 @@ static NSString *const VLCPlayerDisplayControllerDisplayModeKey = @"VLCPlayerDis
 #if TARGET_OS_IOS
     switch (self.displayMode) {
         case VLCPlayerDisplayControllerDisplayModeFullscreen:
-            if ([self.movieViewController respondsToSelector:@selector(showStatusMessage:forPlaybackController:)]) {
-                [self.movieViewController showStatusMessage:failedString forPlaybackController:nil];
+            if ([self.movieViewController respondsToSelector:@selector(showStatusMessage:)]) {
+                [self.movieViewController showStatusMessage:failedString];
             }
             break;
         case VLCPlayerDisplayControllerDisplayModeMiniplayer: