Some minor interface changes.

blommegard · Oct 11, 2013 · 356bff6 · 356bff6
1 parent b5a1b14
commit 356bff6
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 40 deletions.
diff --git a/HSPlayerView.h b/HSPlayerView.h
@@ -16,13 +16,10 @@
 @interface HSPlayerView : UIView
 @property (nonatomic, strong, readonly) AVPlayer *player;
 
-// Start player by setting the URL (for a start)
+// Start player by setting the URL
 @property (nonatomic, copy) NSURL *URL;
 
-- (void)play:(id)sender;
-- (void)pause:(id)sender;
-
-- (BOOL)isPlaying;
+@property (nonatomic, assign) BOOL playing;
 
 @property (nonatomic, assign) BOOL controlsVisible;
 - (void)setControlsVisible:(BOOL)controlsVisible animated:(BOOL)animated;

diff --git a/HSPlayerView.m b/HSPlayerView.m
@@ -123,7 +123,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
                 // Enable buttons & scrubber
 
                 if (!self.isScrubbing)
-                    [self play:self];
+                  [self setPlaying:YES];
             }
             break;
 
@@ -226,7 +226,7 @@ - (AVPlayerLayer *)playerLayer {
 }
 
 - (void)setURL:(NSURL *)URL {
-    _URL = URL;
+    _URL = [URL copy];
 
     // Create Asset, and load
 
@@ -266,6 +266,31 @@ - (void)setControlsVisible:(BOOL)controlsVisible {
     [self setControlsVisible:controlsVisible animated:NO];
 }
 
+- (void)setPlaying:(BOOL)playing {
+  if (playing) {
+    if (self.seekToZeroBeforePlay)  {
+      [self setSeekToZeroBeforePlay:NO];
+      [self.player seekToTime:kCMTimeZero];
+    }
+
+    [self.player play];
+
+    if (self.controlsVisible)
+      [self triggerAutoHideControlsTimer];
+  }
+  else {
+    [self.player pause];
+
+    if (self.controlsVisible)
+      [self cancelAutoHideControlsTimer];
+  }
+}
+
+- (BOOL)playing {
+  //	return mRestoreAfterScrubbingRate != 0.f ||
+  return (self.player.rate > 0.);
+}
+
 #pragma mark - Controls
 
 - (NSArray *)controls {
@@ -385,31 +410,7 @@ - (UITapGestureRecognizer *)doubleTapRecognizer {
     return _doubleTapRecognizer;
 }
 
-#pragma mark Public
-
-- (void)play:(id)sender {
-	if (self.seekToZeroBeforePlay)  {
-		[self setSeekToZeroBeforePlay:NO];
-		[self.player seekToTime:kCMTimeZero];
-	}
-
-    [self.player play];
-
-    if (self.controlsVisible)
-        [self triggerAutoHideControlsTimer];
-}
-
-- (void)pause:(id)sender {
-    [self.player pause];
-
-    if (self.controlsVisible)
-        [self cancelAutoHideControlsTimer];
-}
-
-- (BOOL)isPlaying {
-    //	return mRestoreAfterScrubbingRate != 0.f || 
-    return (self.player.rate != 0.);
-}
+#pragma mark - Public
 
 - (void)setControlsVisible:(BOOL)controlsVisible animated:(BOOL)animated {
     [self willChangeValueForKey:@"controlsVisible"];
@@ -459,7 +460,7 @@ - (void)cancelAutoHideControlsTimer {
 - (void)toggleControlsWithRecognizer:(UIGestureRecognizer *)recognizer {
     [self setControlsVisible:(!self.controlsVisible) animated:YES];
 
-    if (self.controlsVisible && self.isPlaying)
+    if (self.controlsVisible && self.playing)
         [self triggerAutoHideControlsTimer];
 }
 
@@ -571,11 +572,11 @@ - (void)removePlayerTimeObserver {
 }
 
 - (void)playPause:(id)sender {
-    [self isPlaying] ? [self pause:sender] : [self play:sender];
+  [self setPlaying:!self.playing];
 }
 
 - (void)syncPlayPauseButton {
-    [self.playPauseControlButton setImage:([self isPlaying] ? self.pauseImage : self.playImage) forState:UIControlStateNormal];
+    [self.playPauseControlButton setImage:(self.playing ? self.pauseImage : self.playImage) forState:UIControlStateNormal];
 }
 
 - (void)beginScrubbing:(id)sender {

diff --git a/README.markdown b/README.markdown
@@ -6,13 +6,10 @@ Interface:
  ```objective-c
 @property (nonatomic, strong, readonly) AVPlayer *player;
 
-// Start player by setting the URL (for a start)
+// Start player by setting the URL
 @property (nonatomic, copy) NSURL *URL;
 
-- (void)play:(id)sender;
-- (void)pause:(id)sender;
-
-- (BOOL)isPlaying;
+@property (nonatomic, assign) BOOL playing;
 
 @property (nonatomic, assign) BOOL controlsVisible;
 - (void)setControlsVisible:(BOOL)controlsVisible animated:(BOOL)animated;