Merge branch 'release/1.8.10'

SRGSSR · May 24, 2016 · 701b19b · 701b19b
2 parents 070087e + f692d96
commit 701b19b
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 26 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.9):
+  - SRGMediaPlayer (1.8.10):
     - libextobjc/EXTScope (~> 0.4.1)
-    - SRGMediaPlayer/Version (= 1.8.9)
+    - SRGMediaPlayer/Version (= 1.8.10)
     - TransitionKit (~> 2.2.0)
-  - SRGMediaPlayer/Version (1.8.9):
+  - SRGMediaPlayer/Version (1.8.10):
     - 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: e7d70e8ad1fa27ff68281adf8ad1950f76d243da
+  SRGMediaPlayer: 470cb3546c2985587d501dd2c9823fcc03ade885
   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
@@ -650,6 +650,8 @@ - (BOOL)isLive
 static const void * const AVPlayerItemPlaybackLikelyToKeepUpContext = &AVPlayerItemPlaybackLikelyToKeepUpContext;
 static const void * const AVPlayerItemLoadedTimeRangesContext = &AVPlayerItemLoadedTimeRangesContext;
 
+static const void * const AVPlayerItemBufferEmptyContext = &AVPlayerItemBufferEmptyContext;
+
 - (AVPlayer *)player
 {
 	@synchronized(self)
@@ -672,6 +674,7 @@ - (void)setPlayer:(AVPlayer *)player
 		[_player removeObserver:self forKeyPath:@"rate" context:(void *)AVPlayerRateContext];
 		[_player removeObserver:self forKeyPath:@"currentItem.playbackLikelyToKeepUp" context:(void *)AVPlayerItemPlaybackLikelyToKeepUpContext];
 		[_player removeObserver:self forKeyPath:@"currentItem.loadedTimeRanges" context:(void *)AVPlayerItemLoadedTimeRangesContext];
+        [_player removeObserver:self forKeyPath:@"currentItem.playbackBufferEmpty" context:(void *)AVPlayerItemBufferEmptyContext];
 
 		[defaultCenter removeObserver:self name:AVPlayerItemDidPlayToEndTimeNotification object:_player.currentItem];
 		[defaultCenter removeObserver:self name:AVPlayerItemFailedToPlayToEndTimeNotification object:_player.currentItem];
@@ -700,6 +703,7 @@ - (void)setPlayer:(AVPlayer *)player
 			[player addObserver:self forKeyPath:@"rate" options:NSKeyValueObservingOptionNew|NSKeyValueObservingOptionOld context:(void *)AVPlayerRateContext];
 			[player addObserver:self forKeyPath:@"currentItem.playbackLikelyToKeepUp" options:0 context:(void *)AVPlayerItemPlaybackLikelyToKeepUpContext];
 			[player addObserver:self forKeyPath:@"currentItem.loadedTimeRanges" options:NSKeyValueObservingOptionNew context:(void *)AVPlayerItemLoadedTimeRangesContext];
+            [player addObserver:self forKeyPath:@"currentItem.playbackBufferEmpty" options:NSKeyValueObservingOptionNew context:(void *)AVPlayerItemBufferEmptyContext];
 
 			[defaultCenter addObserver:self selector:@selector(playerItemDidPlayToEndTime:) name:AVPlayerItemDidPlayToEndTimeNotification object:playerItem];
 			[defaultCenter addObserver:self selector:@selector(playerItemFailedToPlayToEndTime:) name:AVPlayerItemFailedToPlayToEndTimeNotification object:playerItem];
@@ -931,6 +935,9 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 			[player play];
 		}
 	}
+    else if (context == AVPlayerItemBufferEmptyContext) {
+        [self fireEvent:self.stallEvent userInfo:nil];
+    }
 	else if (context == RTSMediaPlayerPictureInPicturePossibleContext || context == RTSMediaPlayerPictureInPictureActiveContext) {
 		[self postNotificationName:RTSMediaPlayerPictureInPictureStateChangeNotification userInfo:nil];
 

diff --git a/SRGMediaPlayer.podspec b/SRGMediaPlayer.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name                  = "SRGMediaPlayer"
-  s.version               = "1.8.9"
+  s.version               = "1.8.10"
   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" }