Merge branch 'release/1.6.6'

# Conflicts: # Podfile.lock # Pods/Local Podspecs/SRGMediaPlayer.podspec.json # Pods/Manifest.lock # Pods/Pods.xcodeproj/project.pbxproj # Pods/Pods.xcodeproj/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme # RTSMediaPlayer/RTSMediaPlayerController.h # SRGMediaPlayer.podspec
SRGSSR · Apr 7, 2016 · 7f197d0 · 7f197d0
2 parents cc0f54d + c17c0f7
commit 7f197d0
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 30 deletions.
diff --git a/Podfile.lock b/Podfile.lock
@@ -14,11 +14,11 @@ PODS:
   - SDWebImage (3.7.0):
     - SDWebImage/Core (= 3.7.0)
   - SDWebImage/Core (3.7.0)
-  - SRGMediaPlayer (1.6.5):
+  - SRGMediaPlayer (1.6.6):
     - libextobjc/EXTScope (~> 0.4.1)
-    - SRGMediaPlayer/Version (= 1.6.5)
+    - SRGMediaPlayer/Version (= 1.6.6)
     - TransitionKit (~> 2.2.0)
-  - SRGMediaPlayer/Version (1.6.5):
+  - SRGMediaPlayer/Version (1.6.6):
     - libextobjc/EXTScope (~> 0.4.1)
     - TransitionKit (~> 2.2.0)
   - TransitionKit (2.2.0)
@@ -40,7 +40,7 @@ SPEC CHECKSUMS:
   libextobjc: a650fc1bf489a3d3a9bc2e621efa3e1006fc5471
   MAKVONotificationCenter: eddfb85e77040323ee43a0fddbe616926ec005a8
   SDWebImage: b42db92951f9d565c55f1d7f1d5efe47e33a7515
-  SRGMediaPlayer: a1e3ae2f66a491651622c47a6f5dce3902e3a8e0
+  SRGMediaPlayer: 1136d79914d30d2d942bd732c84eeae20f7f80ce
   TransitionKit: 5c9001a77acc409d71f26a4eba0159cf8619c418
 
 COCOAPODS: 0.39.0
diff --git a/Pods/Local Podspecs/SRGMediaPlayer.podspec.json b/Pods/Local Podspecs/SRGMediaPlayer.podspec.json
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/SRGMediaPlayer.xcscheme
diff --git a/RTSMediaPlayer/RTSMediaPlayerController.h b/RTSMediaPlayer/RTSMediaPlayerController.h
@@ -200,6 +200,9 @@
 /**
  *  Start playing a media specified using its identifier, starting at a specific time. Retrieving the media URL requires
  *  a data source to be bound to the player controller
+ *
+ *  @discussion If time is kCMTimeZero, playback will beging at the default position (start of a VOD, or live for a DVR).
+ *              If you need to start at the beginning of a DVR stream, use a small time (e.g. CMTimeMakeWithSeconds(1., 4.))
  */
 - (void)playIdentifier:(NSString *)identifier atTime:(CMTime)time;
 

diff --git a/RTSMediaPlayer/RTSMediaPlayerController.m b/RTSMediaPlayer/RTSMediaPlayerController.m
@@ -452,15 +452,17 @@ - (void)reset
 
 - (void)seekToTime:(CMTime)time completionHandler:(void (^)(BOOL finished))completionHandler
 {
+	if (CMTIME_IS_INVALID(time)) {
+		return;
+	}
+
 	if (self.stateMachine.currentState != self.seekingState) {
 		[self fireEvent:self.seekEvent userInfo:nil];
 	}
 
 	RTSMediaPlayerLogDebug(@"Seeking to %.2f sec.", CMTimeGetSeconds(time));
 
 	[self.player seekToTime:time
-			toleranceBefore:kCMTimeZero
-			 toleranceAfter:kCMTimeZero
 		  completionHandler:completionHandler];
 }
 
@@ -773,8 +775,6 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 					else {
 						// Not using [self seek...] to avoid triggering undesirable state events.
 						[self.player seekToTime:[self.startTimeValue CMTimeValue]
-								toleranceBefore:kCMTimeZero
-								 toleranceAfter:kCMTimeZero
 							  completionHandler:^(BOOL finished) {
 								  if (finished) {
 									  [self play];

diff --git a/SRGMediaPlayer.podspec b/SRGMediaPlayer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "SRGMediaPlayer"
-  s.version               = "1.6.5"
+  s.version               = "1.6.6"
   s.summary               = "Shared media player for SRG mobile apps."
   s.homepage              = "https://github.com/SRGSSR/SRGMediaPlayer-iOS"
   s.authors               = { "Frédéric Humbert-Droz" => "fred.hd@me.com", "Cédric Luthi" => "cedric.luthi@rts.ch", "Cédric Foellmi" => "cedric@onekilopars.ec", "Samuel Défago" => "defagos@gmail.com" }