Browse Source

movie view controller: reduce external API

Felix Paul Kühne 9 years ago
parent
commit
f2ce67d1ae
2 changed files with 9 additions and 11 deletions
  1. 0 3
      Sources/VLCMovieViewController.h
  2. 9 8
      Sources/VLCMovieViewController.m

+ 0 - 3
Sources/VLCMovieViewController.h

@@ -103,7 +103,4 @@
 
 
 - (BOOL)rotationIsDisabled;
 - (BOOL)rotationIsDisabled;
 
 
-- (void)setControlsHidden:(BOOL)hidden animated:(BOOL)animated;
-- (void)showStatusMessage:(NSString *)statusMessage;
-
 @end
 @end

+ 9 - 8
Sources/VLCMovieViewController.m

@@ -495,6 +495,12 @@ typedef NS_ENUM(NSInteger, VLCPanType) {
     return YES;
     return YES;
 }
 }
 
 
+- (void)dismissViewControllerAnimated:(BOOL)flag completion:(void (^)(void))completion
+{
+    [self setControlsHidden:YES animated:animated];
+    [super dismissViewControllerAnimated:flag completion:completion];
+}
+
 - (void) updateDefaults
 - (void) updateDefaults
 {
 {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
@@ -843,7 +849,7 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
 
 - (void)showStatusMessage:(NSString *)statusMessage forPlaybackController:(VLCPlaybackController *)controller
 - (void)showStatusMessage:(NSString *)statusMessage forPlaybackController:(VLCPlaybackController *)controller
 {
 {
-    [self showStatusMessage:statusMessage];
+    [self.statusLabel showStatusMessage:statusMessage];
 }
 }
 
 
 - (void)displayMetadataForPlaybackController:(VLCPlaybackController *)controller
 - (void)displayMetadataForPlaybackController:(VLCPlaybackController *)controller
@@ -1010,11 +1016,6 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
     [self _resetIdleTimer];
     [self _resetIdleTimer];
 }
 }
 
 
-- (void)showStatusMessage:(NSString *)statusMessage
-{
-    [self.statusLabel showStatusMessage:statusMessage];
-}
-
 #pragma mark - multi-select delegation
 #pragma mark - multi-select delegation
 
 
 - (void)toggleUILock
 - (void)toggleUILock
@@ -1304,10 +1305,10 @@ currentMediaHasTrackToChooseFrom:(BOOL)currentMediaHasTrackToChooseFrom
 
 
     if ([vpc.mediaPlayer isPlaying]) {
     if ([vpc.mediaPlayer isPlaying]) {
         [vpc.listPlayer pause];
         [vpc.listPlayer pause];
-        [self.statusLabel showStatusMessage:@"  ▌▌"];
+        [self.statusLabel showStatusMessage:@"  ▌▌" forPlaybackController:nil];
     } else {
     } else {
         [vpc.listPlayer play];
         [vpc.listPlayer play];
-        [self.statusLabel showStatusMessage:@" ►"];
+        [self.statusLabel showStatusMessage:@" ►" forPlaybackController:nil];
     }
     }
 }
 }