Commit 41e422b1 authored by Anssi Piirainen's avatar Anssi Piirainen
Browse files

new versions of Captions and iPad plugins

parent a71d6246
......@@ -369,7 +369,7 @@
</macrodef>
<target name="release-plugin" description="releases one plugin, specify the plugin name with -Dplugin=">
<ant antfile="../${plugin}/build.xml" target="release-remote" dir="../${plugin}">
<ant antfile="build.xml" target="release-remote" dir="../plugins/${plugin}">
<property name="remotedir" value="${remotedir}"/>
<property name="all-swf-zip" value="${basedir}/dist/latest.zip"/>
<property name="swfremotedir" value="${swfremotedir}"/>
......@@ -377,6 +377,14 @@
<property name="aws-secretKey" value="${aws-secretKey}"/>
<property name="url-file" value="${url-file}"/>
<property name="keyfile" value="${keyfile}"/>
<property name="devkit-dir" value="../${devkit-dir}"/>
</ant>
</target>
<target name="release-js-plugin" description="releases one JS plugin, specify the plugin name with -Dplugin=">
<ant antfile="build.xml" target="release-remote" dir="../js-plugins/${plugin}">
<property name="devkit-dir" value="../${devkit-dir}"/>
</ant>
</target>
......
......@@ -9,9 +9,9 @@
Flash embedding and provides the Flowplayer API.
-->
<!--<script type="text/javascript" src="flowplayer-3.0.5.min.js"></script>-->
<script src="../flowplayer-3.2.6.min.js"></script>
<script src="../src/javascript/flowplayer.js/flowplayer-3.2.9.min.js"></script>
<!-- some minimal styling, can be removed -->
<!-- some minimal styling, can be removed -->
<link rel="stylesheet" type="text/css" href="style.css">
<!-- page title -->
......@@ -33,7 +33,7 @@
//debug: true,
log : {
level: 'debug',
filter: ['org.flowplayer.controller.*', 'org.flowplayer.pseudostreaming.*']
filter: ['org.flowplayer.captions.*']
// filter: ['org.flowplayer.pseudostreaming.*', 'org.flowplayer.captions.*' /*'org.flowplayer.view.Launcher', 'org.flowplayer.content.*'*/]
},
canvas: {
......
......@@ -3,7 +3,7 @@
<meta http-equiv="content-type"
content="text/html; charset=UTF-8">
<!--<script type="text/javascript" src="flowplayer-3.0.5.min.js"></script>-->
<script src="../flowplayer-3.2.6.min.js"></script>
<script src="../src/javascript/flowplayer.js/flowplayer-3.2.9.min.js"></script>
<!-- page title -->
......@@ -21,7 +21,7 @@
<script>
flowplayer("player", "../build/flowplayer.swf",
{
log: { level: 'debug', filter: 'org.flowplayer.captions.Captione' },
log: { level: 'debug', filter: 'org.flowplayer.captions.*' },
onBegin: function() {
console.log("Begin");
......@@ -46,10 +46,10 @@
clip: {
// here is our high quality movie
url: 'http://pseudo01.hddn.com/vod/demo.flowplayervod/flowplayer-700.flv',
url: 'http://pseudo01.hddn.com/vod/demo.flowplayervod/flowplayer-700.flv'
// this is the SubRib file with captions info
captionUrl: '../build/tt.xml'
// captionUrl: 'http://releases.flowplayer.org/data/timedtext.xml'
},
plugins: {
......
Version history
3.2.12
------
- #22, reinstate validExtensions variable
- #26, make isFullscreen return something meaningful
- #359, playlist-based splash images: check for a valid extension and set as the clip poster.
3.2.9
-----
- fixed issue #381, cuepoint.time was left undefined
......
DEVKIT_HOME=../../lib/devkit
basename=flowplayer.ipad
version=3.2.11
version=3.2.12
......@@ -118,7 +118,7 @@
<echo message="release-remote: uploading to ${basename}" />
<remotecopy bucketname="flowplayer-releases/${basename}" keyfile="${keyfile}" pass="${pass}">
<releasefiles>
<fileset dir="${basename}">
<fileset dir=".">
<include name="${basename}-${version}.js" />
<include name="${basename}-${version}.min.js" />
</fileset>
......
Version history:
3.2.9
-----
- #19, loadCaptions() had disappeared somewhere, now works again
3.2.8
-----
- addCaptions() takes in a JSON array of caption objects. The format of these JSON caption objects is now:
......
devkit-dir=../../lib/devkit
version=3.2.8
\ No newline at end of file
version=3.2.9
\ No newline at end of file
......@@ -118,6 +118,10 @@ package org.flowplayer.captions {
Clip(_player.playlist.clips[clipIndex]).setCustomProperty("captionUrl", captions);
if (!_loader) {
_loader = new CaptionLoader(_player, _player.playlist, _config);
}
//#574 re-load captions for the clip not the entire playlist.
_loader.loadClipCaption(Clip(_player.playlist.clips[clipIndex]),function():void {
parseIfLoadedAndViewAvailable();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment