diff options
author | Karl Berry <karl@freefriends.org> | 2015-07-28 21:22:14 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2015-07-28 21:22:14 +0000 |
commit | 0f2e8a3f6cc986296e73e726fe1f599cbb6b2e63 (patch) | |
tree | 897c0b0523fb35e7cc9906180a3eebf2b4ef7e54 /Master/texmf-dist/source | |
parent | 2a6ba6d868071a3d636d8e91f87240934ad24251 (diff) |
media9 (28jul15)
git-svn-id: svn://tug.org/texlive/trunk@37983 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
5 files changed, 21 insertions, 36 deletions
diff --git a/Master/texmf-dist/source/latex/media9/media9.tex b/Master/texmf-dist/source/latex/media9/media9.tex index b04fb4a7926..c278a4c5ee7 100644 --- a/Master/texmf-dist/source/latex/media9/media9.tex +++ b/Master/texmf-dist/source/latex/media9/media9.tex @@ -633,7 +633,6 @@ parameter & description\\\hline\hline {\tt autoPlay=true|false} & if {\tt=true}, automatically starts playback after activation (see option `{\tt activation})'\\ {\tt autoRewind=true|false} &(VPlayer.swf only) if {\tt=true}, automatically rewind to the first frame after playback has finished; default is `{\tt false}'\\ {\tt loop=true|false} & if {\tt=true}, media is played in a loop\\ -{\tt stepping=true|false} &(VPlayer.swf only) if {\tt=true}, the video advances by roughly one frame per mouse click\\ {\tt scaleMode=letterbox|none| \phantom{.}\hfill{}stretch|zoom} & default: {\tt letterbox}; determines how to scale the video in order to fit into player\\ {\tt hideBar=true|false} &(APlayer.swf only) if {\tt=true}, the progress bar indicating the play position is not shown\\ {\tt volume=<value between 0.0 \phantom{.}\hfill{}and 1.0>} & sets volume of the sound\\ @@ -658,7 +657,6 @@ function & argument &description\\\hline\hline {\tt play} & number (optional) & play media, optionally starting at \emph{number} seconds offset into the media file\\ {\tt pause} & number (optional) & pause media, optionally at the given offset of \emph{number} seconds into the media file\\ {\tt playPause} & & toggle between play and pause\\ -{\tt stepping} & & (VPlayer.swf only) toggle stepping mode (one frame per click)\\ {\tt setSource} & string & load another media file (path to file, embedded using option `{\tt addresource}', or URL)\\ {\tt seek} & number & move the play location to a time offset from the beginning of the media; argument measured in seconds\\ {\tt rewind} & & rewind media to the beginning (without pausing it)\\ diff --git a/Master/texmf-dist/source/latex/media9/players/APlayer.mxml b/Master/texmf-dist/source/latex/media9/players/APlayer.mxml index 263123a369d..29dcd64df0f 100644 --- a/Master/texmf-dist/source/latex/media9/players/APlayer.mxml +++ b/Master/texmf-dist/source/latex/media9/players/APlayer.mxml @@ -348,7 +348,9 @@ function(e:ContextMenuEvent):void{mute();}); this.contextMenu.customItems.push( - new ContextMenuItem("Seek, [\u2190]/[\u2192]", true, false, true)); + new ContextMenuItem("via keyboard:", true, false, true)); + this.contextMenu.customItems.push( + new ContextMenuItem("Seek, [\u2190]/[\u2192]", false, false, true)); this.contextMenu.customItems.push( new ContextMenuItem("Volume, [\u2191]/[\u2193]", false, false, true)); this.contextMenu.customItems.push( diff --git a/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml b/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml index cc1a1a0c629..aae99ffcb27 100644 --- a/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml +++ b/Master/texmf-dist/source/latex/media9/players/APlayer9.mxml @@ -338,7 +338,9 @@ function(e:ContextMenuEvent):void{mute();}); this.contextMenu.customItems.push( - new ContextMenuItem("Seek, [\u2190]/[\u2192]", true, false, true)); + new ContextMenuItem("via keyboard:", true, false, true)); + this.contextMenu.customItems.push( + new ContextMenuItem("Seek, [\u2190]/[\u2192]", false, false, true)); this.contextMenu.customItems.push( new ContextMenuItem("Volume, [\u2191]/[\u2193]", false, false, true)); this.contextMenu.customItems.push( diff --git a/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml b/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml index ff3dc7962b0..c83ef4e3999 100644 --- a/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml +++ b/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml @@ -4,7 +4,7 @@ <!-- a FlashPlayer-10 compatible component for playing --> <!-- FLV and MP4/H.264 video files and streams. --> <!-- --> -<!-- version 20150601 --> +<!-- version 20150722 --> <!-- --> <!-- --> <!-- The free Apache Flex 4 SDK is required to compile --> @@ -51,7 +51,6 @@ [Bindable] private var autoRewind:Boolean=false; [Bindable] private var loop:Boolean=false; [Bindable] private var vol:Number=0.75; - [Bindable] private var stepping:Boolean=false; private var vidComplete:Boolean=false; private var deltaSeek:Number; private var curTime:Number; @@ -67,7 +66,6 @@ if(flashVars.loop=='true'){loop=true} if(flashVars.volume){vol=Number(flashVars.volume)} if(flashVars.scaleMode){scaleMode=flashVars.scaleMode} - if(flashVars.stepping){stepping=flashVars.stepping} } private function onProgress(event:ProgressEvent):void { @@ -152,10 +150,6 @@ } } - private function onEnterFrame(e:Event):void { - if(stepping&&vidDisp.playing){vidDisp.pause();} - } - private function onCurrentTimeChange(e:Event):void { if(vidDisp.playing&&pauseAtPos>=0&&vidDisp.currentTime<pauseAtPos) toBePaused=true; @@ -187,10 +181,6 @@ vidDisp.seek(p); } - private function step():void { - if(stepping){stepping=false;}else{stepping=true;} - } - private function rewind():void { vidDisp.seek(0); } @@ -251,7 +241,6 @@ private function initApp():void { this.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown); this.addEventListener(KeyboardEvent.KEY_UP, onKeyUp); - this.addEventListener(Event.ENTER_FRAME, onEnterFrame); ExternalInterface.addCallback("play", play); ExternalInterface.addCallback("pause", pause); ExternalInterface.addCallback("playPause", playPause); @@ -260,7 +249,6 @@ ExternalInterface.addCallback("volume", volume); ExternalInterface.addCallback("mute", mute); ExternalInterface.addCallback("setSource", setSource); - ExternalInterface.addCallback("stepping", step); ExternalInterface.addCallback("currentTime", currentTime); ExternalInterface.addCallback("duration", duration); ExternalInterface.addCallback("playing", playing); @@ -288,7 +276,9 @@ function(e:ContextMenuEvent):void{mute();}); this.contextMenu.customItems.push( - new ContextMenuItem("Seek, [\u2190]/[\u2192]", true, false, true)); + new ContextMenuItem("via keyboard:", true, false, true)); + this.contextMenu.customItems.push( + new ContextMenuItem("Seek, [\u2190]/[\u2192]", false, false, true)); this.contextMenu.customItems.push( new ContextMenuItem("Volume, [\u2191]/[\u2193]", false, false, true)); @@ -297,6 +287,9 @@ itemPlayPause.caption=(vidDisp.playing ? "Pause" : "Play")+", [Space]"; itemMute.caption=(vidDisp.muted ? "Unmute" : "Mute")+", [m]";} ); + + //autoPlay setting not reliable + if(autoPlay) {while(!vidDisp.playing) play();}; } ]]> </fx:Script> @@ -331,7 +324,7 @@ /> <s:Button alpha="0" width="100%" height="100%" - mouseDown="if(stepping){vidDisp.play();}else{vidDisp.pause();}" - mouseUp="if(vidComplete) vidDisp.seek(0);if(!stepping){vidDisp.play();}" + mouseDown="vidDisp.pause();" + mouseUp="if(vidComplete) vidDisp.seek(0);vidDisp.play();" /> </s:Application> diff --git a/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml b/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml index 5ecbaaf4d53..4379385d75b 100644 --- a/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml +++ b/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml @@ -4,7 +4,7 @@ <!-- a FlashPlayer-9 compatible component for playing --> <!-- FLV and MP4/H.264 video files and streams. --> <!-- --> -<!-- version 20150601 --> +<!-- version 20150722 --> <!-- --> <!-- Copyright (C) 2012-today Alexander Grahn --> <!-- --> @@ -37,7 +37,6 @@ [Bindable] private var autoPlay:Boolean=false; [Bindable] private var loop:Boolean=false; [Bindable] private var vol:Number=0.75; - [Bindable] private var stepping:Boolean=false; [Bindable] private var keepAspect:Boolean=true; private var vidComplete:Boolean=false; private var deltaSeek:Number; @@ -55,7 +54,6 @@ if(flashVars.autoPlay=='true') autoPlay=true; if(flashVars.loop=='true') loop=true; if(flashVars.volume) vol=Number(flashVars.volume); - if(flashVars.stepping) stepping=flashVars.stepping; if(flashVars.scaleMode && flashVars.scaleMode!='letterbox') keepAspect=false; } @@ -141,10 +139,6 @@ } } - private function onEnterFrame(e:Event):void { - if(stepping&&vidDisp.playing){vidDisp.pause();} - } - private function onPlayheadUpdate(e:Event):void { if(vidDisp.playing&&pauseAtPos>=0&&vidDisp.playheadTime<pauseAtPos) toBePaused=true; @@ -176,10 +170,6 @@ vidDisp.playheadTime=p; } - private function step():void { - if(stepping){stepping=false;}else{stepping=true;} - } - private function rewind():void { vidDisp.playheadTime=0; } @@ -242,7 +232,6 @@ private function initApp():void { this.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown); this.addEventListener(KeyboardEvent.KEY_UP, onKeyUp); - this.addEventListener(Event.ENTER_FRAME, onEnterFrame); ExternalInterface.addCallback("play", play); ExternalInterface.addCallback("pause", pause); ExternalInterface.addCallback("playPause", playPause); @@ -251,7 +240,6 @@ ExternalInterface.addCallback("volume", volume); ExternalInterface.addCallback("mute", mute); ExternalInterface.addCallback("setSource", setSource); - ExternalInterface.addCallback("stepping", step); ExternalInterface.addCallback("currentTime", currentTime); ExternalInterface.addCallback("duration", duration); ExternalInterface.addCallback("playing", playing); @@ -280,7 +268,9 @@ function(e:ContextMenuEvent):void{mute();}); this.contextMenu.customItems.push( - new ContextMenuItem("Seek, [\u2190]/[\u2192]", true, false, true)); + new ContextMenuItem("via keyboard:", true, false, true)); + this.contextMenu.customItems.push( + new ContextMenuItem("Seek, [\u2190]/[\u2192]", false, false, true)); this.contextMenu.customItems.push( new ContextMenuItem("Volume, [\u2191]/[\u2193]", false, false, true)); @@ -324,7 +314,7 @@ <mx:Button alpha="0" width="100%" height="100%" cornerRadius="0" paddingBottom="0" paddingLeft="0" paddingRight="0" paddingTop="0" - mouseDown="if(stepping){vidDisp.play();}else{vidDisp.pause();}" - mouseUp="if(vidComplete) vidDisp.playheadTime=0;if(!stepping){vidDisp.play();}" + mouseDown="vidDisp.pause();" + mouseUp="if(vidComplete) vidDisp.playheadTime=0;vidDisp.play();" /> </mx:Application> |