Merge branch 'release/1.8.4'

SRGSSR · May 11, 2016 · 6510efd · 6510efd
2 parents ba259b2 + 0053972
commit 6510efd
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 27 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.8.3):
+  - SRGMediaPlayer (1.8.4):
     - libextobjc/EXTScope (~> 0.4.1)
-    - SRGMediaPlayer/Version (= 1.8.3)
+    - SRGMediaPlayer/Version (= 1.8.4)
     - TransitionKit (~> 2.2.0)
-  - SRGMediaPlayer/Version (1.8.3):
+  - SRGMediaPlayer/Version (1.8.4):
     - 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: 7eb098ba4e188ecfe2381cdeb1fae502f30dde82
+  SRGMediaPlayer: 200abce97328f253f6ca03cef5d7cd216adbce09
   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.m b/RTSMediaPlayer/RTSMediaPlayerController.m
@@ -55,6 +55,7 @@ @interface RTSMediaPlayerController () <RTSMediaPlayerControllerDataSource, UIGe
 @property (readwrite) TKState *playingState;
 @property (readwrite) TKState *seekingState;
 @property (readwrite) TKState *stalledState;
+@property (readwrite) TKState *endedState;
 
 @property (readwrite) TKEvent *loadEvent;
 @property (readwrite) TKEvent *loadSuccessEvent;
@@ -357,6 +358,7 @@ - (TKStateMachine *)stateMachine
 	self.playingState = playing;
 	self.stalledState = stalled;
 	self.seekingState = seeking;
+	self.endedState = ended;
 
 	self.loadEvent = load;
 	self.loadSuccessEvent = loadSuccess;
@@ -411,6 +413,10 @@ - (void)prepareToPlay
 
 - (void)play
 {
+	if ([self.stateMachine.currentState isEqual:self.endedState]) {
+		[self reset];
+	}
+
 	if ([self.stateMachine.currentState isEqual:self.idleState]) {
 		[self loadPlayerAndAutoStartAtTime:[NSValue valueWithCMTime:kCMTimeZero]];
 	}
@@ -819,7 +825,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 		switch (playerItem.status) {
 			case AVPlayerItemStatusReadyToPlay:
 				if (![self.stateMachine.currentState isEqual:self.playingState] && self.startTimeValue) {
-					if (CMTIME_COMPARE_INLINE([self.startTimeValue CMTimeValue], ==, kCMTimeZero)) {
+					if (CMTIME_COMPARE_INLINE([self.startTimeValue CMTimeValue], ==, kCMTimeZero) || CMTIME_IS_INVALID([self.startTimeValue CMTimeValue])) {
 						[self play];
 					}
 					else {

diff --git a/SRGMediaPlayer.podspec b/SRGMediaPlayer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "SRGMediaPlayer"
-  s.version               = "1.8.3"
+  s.version               = "1.8.4"
   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", "Pierre-Yves Bertholon" => "py.bertholon@gmail.com" }