Merge pull request #999 from kaltura/playFromDvriOS

Play from dvri os
kaltura · Sep 29, 2014 · a42dced · a42dced
2 parents 24b050e + 25c86ae
commit a42dced
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/modules/EmbedPlayer/resources/mw.EmbedPlayer.js b/modules/EmbedPlayer/resources/mw.EmbedPlayer.js
@@ -2829,7 +2829,12 @@
 		},
 
 		isDVR: function() {
-			return this.kalturaPlayerMetaData[ 'dvrStatus' ];
+			if ( this.kalturaPlayerMetaData && this.kalturaPlayerMetaData[ 'dvrStatus' ] )  {
+				return this.kalturaPlayerMetaData[ 'dvrStatus' ];
+			}
+
+			return false;
+
 		},
 
 		disableComponentsHover: function(){

diff --git a/modules/KalturaSupport/components/live/liveCore.js b/modules/KalturaSupport/components/live/liveCore.js
@@ -100,7 +100,7 @@
 					setTimeout( function() {
 						if ( !_this.onAirStatus ) {
 							//if we already played once it means stream data was loaded. We can continue playing in "VOD" mode
-							if ( !_this.isNativeHLS() && !embedPlayer.firstPlay && _this.isDVR() ) {
+							if ( !embedPlayer.firstPlay && _this.isDVR() ) {
 								embedPlayer.triggerHelper( 'liveEventEnded' );
 							} else {
 								//remember last state
@@ -159,14 +159,21 @@
 						//once moving back to live, set live state again
 						embedPlayer.bindHelper( 'movingBackToLive', function() {
 							embedPlayer.setLive( true );
+							if ( _this.isNativeHLS() ) {
+								embedPlayer.setDuration( _this.dvrWindow );
+							}
 						} );
 					}
-					embedPlayer.setDuration(  embedPlayer.getPlayerElement().duration  );
-					//'ended' will be sent for js layer, update the player position for next replay
-					embedPlayer.bindHelper( 'ended', function() {
-						embedPlayer.getPlayerElement().seek( 0 );
-					} );
+
+					if ( !_this.isNativeHLS() ) {
+						embedPlayer.setDuration( embedPlayer.getPlayerElement().duration );
+						embedPlayer.bindHelper( 'ended', function() {
+							embedPlayer.getPlayerElement().seek( 0 );
+						});
+					}
 				}
+
+
 			});
 		},