summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/media9/ChangeLog4
-rw-r--r--Master/texmf-dist/doc/latex/media9/media9.pdfbin3599274 -> 3629397 bytes
-rw-r--r--Master/texmf-dist/source/latex/media9/players/VPlayer.mxml26
-rw-r--r--Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml8
-rw-r--r--Master/texmf-dist/tex/latex/media9/media9.sty4
-rw-r--r--Master/texmf-dist/tex/latex/media9/players/APlayer.swfbin353064 -> 354878 bytes
-rw-r--r--Master/texmf-dist/tex/latex/media9/players/SlideShow.swfbin324812 -> 326725 bytes
-rw-r--r--Master/texmf-dist/tex/latex/media9/players/VPlayer.swfbin480743 -> 507800 bytes
-rw-r--r--Master/texmf-dist/tex/latex/media9/players/VPlayer9.swfbin219242 -> 219242 bytes
9 files changed, 30 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 77c58cf9f15..991b8bde409 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,7 @@
+2015-07-30
+ * v0.57
+ * fix: `autoPlay' option of VPlayer didn't work reliably
+
2015-07-28
* v0.56
* fix: expl3[2015/07/14]-related adjustments
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index 25fb6928ef4..1d19310e44c 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.pdf
+++ b/Master/texmf-dist/doc/latex/media9/media9.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml b/Master/texmf-dist/source/latex/media9/players/VPlayer.mxml
index c83ef4e3999..ce7f1ee2fe0 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 20150722 -->
+<!-- version 20150730 -->
<!-- -->
<!-- -->
<!-- The free Apache Flex 4 SDK is required to compile -->
@@ -74,11 +74,23 @@
}
import org.osmf.events.MediaPlayerStateChangeEvent;
+ import org.osmf.media.MediaPlayerState;
import mx.controls.Alert;
private function onStateChange(event:MediaPlayerStateChangeEvent):void {
vidComplete=false;
- if(event.state=='playbackError')
- Alert.show('Unable to play \''+event.target.source+'\'','Error');
+ switch(event.state) {
+ case MediaPlayerState.PLAYBACK_ERROR: // ('playbackError')
+ Alert.show('Unable to play \''+event.target.source+'\'','Error');
+ break;
+ case MediaPlayerState.READY:
+ if(autoPlay) vidDisp.play();
+ break;
+ //MediaPlayerState.BUFFERING
+ //MediaPlayerState.LOADING
+ //MediaPlayerState.PAUSED
+ //MediaPlayerState.PLAYING
+ //MediaPlayerState.UNINITIALIZED
+ }
}
private function onKeyDown(e:KeyboardEvent):void {
@@ -287,9 +299,6 @@
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>
@@ -299,11 +308,14 @@
duration="2000"/>
</fx:Declarations>
+ <!-- autoPlay setting (autoPlay="{autoPlay}") is not reliable;
+ we handle this in MediaPlayerStateChange event -->
<s:VideoDisplay
id="vidDisp"
width="100%" height="100%" scaleMode="{scaleMode}"
source="{source}" volume="{vol}"
- autoPlay="{autoPlay}" autoRewind="{autoRewind}" loop="{loop}"
+ autoPlay="false"
+ autoRewind="{autoRewind}" loop="{loop}"
mediaPlayerStateChange="onStateChange(event);"
complete="vidComplete=true;"
durationChange="vidDisp.seek(0);"
diff --git a/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml b/Master/texmf-dist/source/latex/media9/players/VPlayer9.mxml
index 4379385d75b..ca7e74c64ac 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 20150722 -->
+<!-- version 20150729 -->
<!-- -->
<!-- Copyright (C) 2012-today Alexander Grahn -->
<!-- -->
@@ -23,7 +23,8 @@
<!-- The current maintainer of this work is A. Grahn. -->
<!-- -->
-<mx:Application xmlns:mx="http://www.adobe.com/2006/mxml"
+<mx:Application
+ xmlns:mx="http://www.adobe.com/2006/mxml"
preinitialize="initialise(this.parameters);"
applicationComplete="initApp();"
backgroundAlpha="0"
@@ -63,8 +64,9 @@
}
import mx.events.VideoEvent;
+ //import flash.events.VideoEvent;
import mx.controls.Alert;
- private function onStateChange(event:VideoEvent):void {
+ private function onStateChange(event:mx.events.VideoEvent):void {
vidComplete=false;
if(event.state=='connectionError')
Alert.show('Unable to play \''+event.target.source+'\'','Error');
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 3587c473a15..d2ffe372d1c 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -43,8 +43,8 @@
\RequirePackage{atenddvi}
\RequirePackage{tikz}
-\def\g@mix@date@tl{2015/07/28}
-\def\g@mix@version@tl{0.56}
+\def\g@mix@date@tl{2015/07/30}
+\def\g@mix@version@tl{0.57}
\def\g@mix@liiikerneldate{2015/07/14}
\def\g@mix@liiipkgdate{2015/07/14}
diff --git a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
index 1d445003e6d..30477d3a0b3 100644
--- a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/media9/players/SlideShow.swf b/Master/texmf-dist/tex/latex/media9/players/SlideShow.swf
index 9f1670ccbc1..e62229df17b 100644
--- a/Master/texmf-dist/tex/latex/media9/players/SlideShow.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/SlideShow.swf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf
index 2a40d9f6821..13d14de3204 100644
--- a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/media9/players/VPlayer9.swf b/Master/texmf-dist/tex/latex/media9/players/VPlayer9.swf
index b0ffbd85fb8..c99e5a23f44 100644
--- a/Master/texmf-dist/tex/latex/media9/players/VPlayer9.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/VPlayer9.swf
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 14:02:48 +0000