summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-07-20 21:47:31 +0000
committerKarl Berry <karl@freefriends.org>2013-07-20 21:47:31 +0000
commit0cb266803002915dbdfe403a37b649809b4beee5 (patch)
treee61c99cb523fe5605835c5715d373ed7247e5bf8
parentbb7a297eae14c235d5f218959c9a3c38927bd3fa (diff)
media9 (19jul13)
git-svn-id: svn://tug.org/texlive/trunk@31246 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/media9/ChangeLog7
-rw-r--r--Master/texmf-dist/doc/latex/media9/files/players/APlayer.mxml22
-rw-r--r--Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml11
-rw-r--r--Master/texmf-dist/doc/latex/media9/media9.pdfbin2751983 -> 2754045 bytes
-rw-r--r--Master/texmf-dist/doc/latex/media9/media9.tex8
-rw-r--r--Master/texmf-dist/tex/latex/media9/media9.sty33
-rw-r--r--Master/texmf-dist/tex/latex/media9/players/APlayer.swfbin343550 -> 343617 bytes
-rw-r--r--Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swfbin275743 -> 275742 bytes
-rw-r--r--Master/texmf-dist/tex/latex/media9/players/VPlayer.swfbin501218 -> 501218 bytes
9 files changed, 57 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/media9/ChangeLog b/Master/texmf-dist/doc/latex/media9/ChangeLog
index 07751b993d9..295b748f83a 100644
--- a/Master/texmf-dist/doc/latex/media9/ChangeLog
+++ b/Master/texmf-dist/doc/latex/media9/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-19
+ * v0.29
+ * change: minor improvements of media buttons
+
+2013-06-07
+ * fix: VPlayer updated
+
2013-06-06
* fix: APlayer & VPlayer updated, all players recompiled using
ApacheFlexSDK-4.9.1
diff --git a/Master/texmf-dist/doc/latex/media9/files/players/APlayer.mxml b/Master/texmf-dist/doc/latex/media9/files/players/APlayer.mxml
index 1822f9b82be..04336cba5f5 100644
--- a/Master/texmf-dist/doc/latex/media9/files/players/APlayer.mxml
+++ b/Master/texmf-dist/doc/latex/media9/files/players/APlayer.mxml
@@ -4,7 +4,7 @@
<!-- a FlashPlayer-10 compatible component for playing -->
<!-- MP3 audio files and streams. -->
<!-- -->
-<!-- version 20130606 -->
+<!-- version 20130611 -->
<!-- -->
<!-- -->
<!-- The free Apache Flex 4 SDK is required to compile -->
@@ -51,6 +51,7 @@
<fx:Script>
<![CDATA[
[Bindable] private var source:String;
+ [Bindable] private var policy:String=null;
[Bindable] private var autoPlay:Boolean=false;
[Bindable] private var loop:Boolean=false;
[Bindable] private var vol:Number=0.75;
@@ -76,11 +77,12 @@
import mx.core.FlexGlobals;
private function initialise(flashVars:Object):void {
source=flashVars.source;
- if(flashVars.autoPlay){autoPlay=(flashVars.autoPlay=='true')}
- if(flashVars.loop){loop=(flashVars.loop=='true')}
- if(flashVars.volume){vol=Number(flashVars.volume)}
- if(flashVars.balance){pan=Number(flashVars.balance)}
- if(flashVars.hideBar){hideBar=(flashVars.hideBar=='true')}
+ if(flashVars.policy) policy=flashVars.policy;
+ if(flashVars.autoPlay) autoPlay=(flashVars.autoPlay=='true');
+ if(flashVars.loop) loop=(flashVars.loop=='true');
+ if(flashVars.volume) vol=Number(flashVars.volume);
+ if(flashVars.balance) pan=Number(flashVars.balance);
+ if(flashVars.hideBar) hideBar=(flashVars.hideBar=='true');
}
import mx.controls.Alert;
@@ -92,6 +94,7 @@
snd.addEventListener(IOErrorEvent.IO_ERROR, onError);
snd.addEventListener(ProgressEvent.PROGRESS, onProgress);
snd.addEventListener(Event.COMPLETE, onComplete);
+ if(policy) Security.loadPolicyFile(policy);
snd.load(new URLRequest(source), new SoundLoaderContext(1000, true));
if(autoPlay) play();
}
@@ -221,12 +224,14 @@
this.addEventListener(MouseEvent.MOUSE_OVER, onMouseOver);
}
- private function setSource(src:String):void {
+ private function setSource(s:String):void {
pause();
- source=src;
+ source=s;
initSound();
}
+ private function loadPolicy(p:String):void {policy=p;}
+
private function play():void {
if(playing) return;
try{sndCh = snd.play(playResumePosition, 0, sndTr);}
@@ -291,6 +296,7 @@
ExternalInterface.addCallback("balance", balance);
ExternalInterface.addCallback("mute", mute);
ExternalInterface.addCallback("setSource", setSource);
+ ExternalInterface.addCallback("loadPolicy", loadPolicy);
}
private function onSoundComplete(e:Event):void {
diff --git a/Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml b/Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml
index 6a18cd7f27c..2919fa4857c 100644
--- a/Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml
+++ b/Master/texmf-dist/doc/latex/media9/files/players/VPlayer.mxml
@@ -4,7 +4,7 @@
<!-- a FlashPlayer-10 compatible component for playing -->
<!-- FLV and MP4/H.264 video files and streams. -->
<!-- -->
-<!-- version 20130606 -->
+<!-- version 20130607 -->
<!-- -->
<!-- -->
<!-- The free Apache Flex 4 SDK is required to compile -->
@@ -215,6 +215,10 @@
}
private function init():void {
+ this.setFocus();
+ 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);
@@ -224,10 +228,6 @@
ExternalInterface.addCallback("mute", mute);
ExternalInterface.addCallback("setSource", setSource);
ExternalInterface.addCallback("stepping", step);
- this.setFocus();
- this.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
- this.addEventListener(KeyboardEvent.KEY_UP, onKeyUp);
- this.addEventListener(Event.ENTER_FRAME, onEnterFrame);
}
]]>
</fx:Script>
@@ -254,6 +254,7 @@
complete="loadingProgress.visible=false;"
progress="onProgress(event)"
/>
+
<mx:ProgressBar width="100%" mode="manual"
horizontalCenter="0" bottom="0" labelPlacement="center"
id="playProgress" alpha="0.5"
diff --git a/Master/texmf-dist/doc/latex/media9/media9.pdf b/Master/texmf-dist/doc/latex/media9/media9.pdf
index f584cdd6867..8f205c05d2f 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/doc/latex/media9/media9.tex b/Master/texmf-dist/doc/latex/media9/media9.tex
index 14059b30142..7c4463a3025 100644
--- a/Master/texmf-dist/doc/latex/media9/media9.tex
+++ b/Master/texmf-dist/doc/latex/media9/media9.tex
@@ -6,6 +6,7 @@
%
%\pdfcompresslevel=0
%\pdfobjcompresslevel=0
+\listfiles
\documentclass[a4paper]{article}
\frenchspacing
\usepackage{media9}
@@ -474,7 +475,7 @@ If specified, the media button changes its appearance when the mouse pointer is
\begin{verbatim}
downface=<mouse-button-down text or graphic>
\end{verbatim}
-If specified, the media button changes its appearance when the mouse button is pressed while the pointer is over it. Without this option, the pressed button is visualized by colour inversion of the normal button appearance. An \verb+\includegraphics+ command may need to be enclosed in braces.
+If specified, the media button changes its appearance when the mouse button is pressed while the pointer is over it. When pressed, the button is always slightly offset to appear as if it were being pushed below the surface of the page. An \verb+\includegraphics+ command may need to be enclosed in braces.
\begin{verbatim}
3Dgotoview=<label key>[:<view specification>]
\end{verbatim}
@@ -551,7 +552,7 @@ Sound files and streams in the MP3 format can be played with `APlayer.swf'. Fig.
\caption{Keyboard control of media players `VPlayer.swf' and `APlayer.swf'. The media must have the focus to have effect. Click onto the media if necessary.}\label{kbcontrol}
\begin{tabular}[t]{rp{0.5\linewidth}}\hline
keys & action\\\hline\hline
-\keys{\makebox[2\width][c]{Space}} & play/pause\\
+\keys{\unexpanded{\makebox[2\width][c]{Space}}} & play/pause\\
\keys{Home}, \keys{End} & go to start/end\\
\keys{\arrowkeyleft}, \keys{\arrowkeyright} & seek backwards/forwards\\
\keys{\arrowkeydown}, \keys{\arrowkeyup} & decrease/increase speaker volume\\
@@ -693,8 +694,7 @@ parameter & description\\\hline\hline
width=0.6\linewidth,height=0.3375\linewidth,
activate=pageopen,
flashvars={
- src=rtmp://streaming.music.indiana.edu:1935/onDemand/mp4:media/%
- 20090327_VarRussianTheme-h264-480.m4v
+ src=rtmp://streaming.music.indiana.edu:1935/onDemand/mp4:media/20090327_VarRussianTheme-h264-480.m4v
&scaleMode=stretch
}
]{}{StrobeMediaPlayback.swf}\hfill}
diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty
index 557376460d6..cd03dc9ba73 100644
--- a/Master/texmf-dist/tex/latex/media9/media9.sty
+++ b/Master/texmf-dist/tex/latex/media9/media9.sty
@@ -41,8 +41,8 @@
\RequirePackage{ifpdf}
\RequirePackage{atbegshi}
-\def\g@mix@date@tl{2013/06/03}
-\def\g@mix@version@tl{0.28}
+\def\g@mix@date@tl{2013/07/19}
+\def\g@mix@version@tl{0.29}
\def\g@mix@liiikerneldate{2012/07/16}
\def\g@mix@liiipkgdate{2012/07/16}
@@ -460,6 +460,25 @@
}
\group_end:
+%add AcroForm entry to PDF Catalog
+\AtBeginDocument{
+ \@ifpackageloaded{animate}{}{
+ \bool_if:NTF\g_mix_pdfoutput_bool{
+ \pdfcatalog{/AcroForm~<</Fields~[]/NeedAppearances~true>>}
+ }{
+ \bool_if:NTF\g_mix_dvipdfmx_bool{ %dvipdfmx/XeTeX
+ \special{pdf:put~@catalog~<<
+ /AcroForm~<</Fields~[]/NeedAppearances~true>>>>}
+ }{
+ \special{ps:
+ mark~{Catalog}~<</AcroForm~<</Fields~[]/NeedAppearances~true>>>>~
+ /PUT~pdfmark
+ }
+ }
+ }
+ }
+}
+
%commands for creating PDF objects, annots etc.
\bool_if:NTF\g_mix_pdfoutput_bool{
%helper func to remove `0 R' part from pdf obj reference
@@ -2429,11 +2448,11 @@
/T~(mbtn@\int_use:N\g_mix_mbtncnt_int)
/FT/Btn/Ff~65536
/H/P
- \tl_if_empty:NTF\g_mix_downbtn_tl{/H/I}{/H/P}
- /AP~<<
- /N~\g_mix_normalbtn_tl
- \tl_if_empty:NF\g_mix_overbtn_tl{/R~\g_mix_overbtn_tl}
- \tl_if_empty:NF\g_mix_downbtn_tl{/D~\g_mix_downbtn_tl}
+ /MK~<<
+ /TP~1~/IF~<</S/A/FB~true/A~[0.0~0.0]>>
+ /I~\g_mix_normalbtn_tl
+ \tl_if_empty:NF\g_mix_overbtn_tl{/RI~\g_mix_overbtn_tl}
+ \tl_if_empty:NF\g_mix_downbtn_tl{/IX~\g_mix_downbtn_tl}
>>
/A~<<
/S/JavaScript/JS~(app.focusRect=false;)
diff --git a/Master/texmf-dist/tex/latex/media9/players/APlayer.swf b/Master/texmf-dist/tex/latex/media9/players/APlayer.swf
index 3814a057907..78326f7c793 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/StrobeMediaPlayback.swf b/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf
index afc235629f1..d82fe3beb1d 100644
--- a/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/StrobeMediaPlayback.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 6ecea88f358..f3fb9edab72 100644
--- a/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf
+++ b/Master/texmf-dist/tex/latex/media9/players/VPlayer.swf
Binary files differ