media9 (20nov12)

git-svn-id: svn://tug.org/texlive/trunk@28319 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 46 insertions, 44 deletions

diff --git a/Master/texmf-dist/doc/latex/media9/files/players/SMPfixes.patch b/Master/texmf-dist/doc/latex/media9/files/players/SMPfixes.patch
index f5581f51f9d..04e48f41281 100644
--- a/Master/texmf-dist/doc/latex/media9/files/players/SMPfixes.patch
+++ b/Master/texmf-dist/doc/latex/media9/files/players/SMPfixes.patch
@@ -1,31 +1,37 @@
-######################################################################################################
-#
-# SMPfixes.patch, 20120330, Alexander Grahn
-#
-# Patch for StrobeMediaPlayback version 1.6.328 sources
-# http://sourceforge.net/projects/smp.adobe/files/
-#
-######################################################################################################
-# fix: video could not be restarted after having ended if AS variable `autoRewind' was set to `false'
-# new: show first frame of video as default poster instead of black stage
-# new: play/pause video by clicking on the stage
-######################################################################################################
---- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as.orig	2012-03-23 16:04:41.000000000 +0100
-+++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as	2012-03-26 13:23:52.000000000 +0200
+--- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as.orig	2012-11-14 15:48:22.000000000 +0100
++++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as	2012-11-20 15:14:02.000000000 +0100
 @@ -98,6 +98,11 @@
  		override protected function onMouseClick(event:MouseEvent):void
  		{
  			var playable:PlayTrait = media.getTrait(MediaTraitType.PLAY) as PlayTrait;
-+			var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait;
-+			if(playable.playState == PlayState.STOPPED)
-+			{
-+				try{seekable.seek(0);}catch(e:Object){}
-+			}
++ 			var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait;
++ 			if(playable.playState == PlayState.STOPPED)
++ 			{
++ 				try{seekable.seek(0);}catch(e:Object){}
++ 			}
  			playable.play();
  		}
  		
---- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as.orig	2012-03-26 13:22:33.000000000 +0200
-+++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as	2012-03-26 16:03:07.000000000 +0200
+@@ -134,4 +139,4 @@
+ 		/* static */
+ 		private static const VISIBILITY_DELAY:int = 500;
+ 	}
+-}
+\ No newline at end of file
++}
+--- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as.orig	2012-11-14 15:48:22.000000000 +0100
++++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as	2012-11-14 15:42:53.000000000 +0100
+@@ -106,7 +106,7 @@
+ 			if (_enabled && _sliding == false)
+ 			{
+ 				_sliding = true;
+-				stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag);
++				stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag, true);
+ 				updateFace(down);
+ 				scrubTimer.start();
+ 				dispatchEvent(new ScrubberEvent(ScrubberEvent.SCRUB_START));
+--- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as.orig	2012-11-14 15:48:22.000000000 +0100
++++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as	2012-11-14 15:42:53.000000000 +0100
 @@ -26,6 +26,7 @@
  	import org.osmf.traits.MediaTraitType;
  	import org.osmf.traits.PlayState;
@@ -38,28 +44,24 @@
  		override protected function onMouseClick(event:MouseEvent):void
  		{
  			var playable:PlayTrait = media.getTrait(MediaTraitType.PLAY) as PlayTrait;
-+			var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait;
++            var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait;
 +			if(playable.playState == PlayState.STOPPED)
 +			{
-+				try{seekable.seek(0);}catch(e:Object){}
++			    try{seekable.seek(0);}catch(e:Object){}
 +			}
  			playable.play();
  			event.stopImmediatePropagation();
  		}
---- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as.orig	2012-03-29 16:54:07.000000000 +0200
-+++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as	2012-03-29 16:54:15.000000000 +0200
-@@ -106,7 +106,7 @@
- 			if (_enabled && _sliding == false)
- 			{
- 				_sliding = true;
--				stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag);
-+				stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag, true);
- 				updateFace(down);
- 				scrubTimer.start();
- 				dispatchEvent(new ScrubberEvent(ScrubberEvent.SCRUB_START));
---- ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as.orig	2012-03-23 15:44:09.000000000 +0100
-+++ ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as	2012-03-30 15:00:42.000000000 +0200
-@@ -51,6 +51,7 @@
+@@ -58,4 +64,4 @@
+ 			}
+ 		}
+ 	}
+-}
+\ No newline at end of file
++}
+--- ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as.orig	2012-11-14 15:48:22.000000000 +0100
++++ ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as	2012-11-14 15:42:54.000000000 +0100
+@@ -52,6 +52,7 @@
  	import org.osmf.traits.MediaTraitType;
  	import org.osmf.traits.PlayState;
  	import org.osmf.traits.PlayTrait;
@@ -67,15 +69,15 @@
  	import org.osmf.utils.OSMFSettings;
  	import org.osmf.utils.OSMFStrings;
  	
-@@ -151,6 +152,7 @@
+@@ -152,6 +153,7 @@
  			
  			player.addEventListener(TimeEvent.COMPLETE, onComplete);
  			player.addEventListener(MediaErrorEvent.MEDIA_ERROR, onMediaError);
 +			player.addEventListener(MediaPlayerCapabilityChangeEvent.CAN_PLAY_CHANGE, onCanPlayChange);
  			
- 			// this is used for DVR rolling window
- 			// TODO: Add this event only when the resource is DVR rolling window not all the time
-@@ -266,6 +268,8 @@
+ 			// Add DRM error handler
+ 			var drmManager:DRMManager = DRMManager.getDRMManager();
+@@ -338,6 +340,8 @@
  			mainContainer.backgroundAlpha = 0;
  			mainContainer.addEventListener(MouseEvent.DOUBLE_CLICK, onFullScreenRequest);
  			mainContainer.addEventListener(MouseEvent.CLICK, onMainClick, false);
@@ -84,7 +86,7 @@
  			mainContainer.doubleClickEnabled = true;
  			
  			addChild(mainContainer);
-@@ -343,6 +347,9 @@
+@@ -415,6 +419,9 @@
  				}
  
  				player.addEventListener(PlayEvent.PLAY_STATE_CHANGE, onSetAutoHide);
@@ -94,7 +96,7 @@
  					
  				layout();
  				
-@@ -654,6 +661,38 @@
+@@ -757,6 +764,38 @@
  			}
  		}
  		
@@ -133,7 +135,7 @@
  		/**
  		 * Toggles full screen state.
  		 */ 
-@@ -928,12 +967,20 @@
+@@ -1036,12 +1075,20 @@
  				&&	configuration.endOfVideoOverlay != ""
  				&&	player.loop == false
  				&&	player.playing == false