Commit db7ec95d authored by Anssi Piirainen's avatar Anssi Piirainen
Browse files

Merge remote-tracking branch 'origin/danielr-httpstreaminghls' into dev

parents fefc6ac2 5192e4cf
Version history:
3.2.17
------
- #75 set the child display list different when a gradient is set.
3.2.16
------
- new clip event onMetadataChange, dispatched for example when switching bitrate
Fixes:
- Shows logo in accelerated mode #20
- mid-rolls freeze if multiple providers are used #42
- onFire fired twice on replay #52
- rtmp + hw accel + instream clips lose video, or aspect ratio #44
- URL name parts containing semi-colons (;) should pass validation through linkUrl usage #53
- cuepoints fired multiple times with the bitrateselect plugin #50
- fix for dispatching onBegin in certain situations
- if onStart has been dispatched already prevent dispatching many onBegin events
3.2.15
------
- #15 fixes for #627, handle the display init on startup.
- #615 dispatch begin if in paused mode too early.
- #629 if start has been dispatched already prevent dispatching many begin events.
......@@ -10,11 +30,11 @@ Version history:
- #52 when replaying flag start has dispatched on the current clip.
- #44 fixes for #627 check if the stagevideo dimensions and positioning has changed to update the stage video mask with.
- unbinding and binding stage video events caused issues with instream playlists therefore has to be kept binded.
unbinded stage video events during seeking to prevent the mask repositioning.
- unbinded stage video events during seeking to prevent the mask repositioning.
- #53 update url filter to accomodate for pretty urls with semi colons.
- #50 if we have metadata already set it is being updated during seeks and switching, dispatch metadata change events instead.
3.2.15
3.2.14
------
- #614 when the clip ends if the next clip in the provider has a different provider close the provider stream.
- #627 only detach / attach the display on start events which causes issues in buffering events after a seek in stagevideo.
......
# you need to adjust following to point to your Flex SDK
flexdir=/Users/Api/flex_sdk_4.5.0.19786
flexdir=/Users/Api/flex_sdk_4_6
# change following to point to .exe files when running on Windows
mxmlc_bin= ${flexbindir}/mxmlc
......@@ -15,11 +15,7 @@ site.dir=/Users/api/hyde/site
js.deploy.dir=${site.dir}/deploy/js
deploy.dir=${site.dir}/content/swf
plugins.buildfiles=analytics/build.xml,audio/build.xml,bwcheck/build.xml,bwcheck/build-httpstreaming.xml \
captions/build.xml,content/build.xml,controls/build.xml,controls/build-tube.xml,controls/build-air.xml,controls/build-skinless.xml, \
f4m/build.xml,httpstreaming/build.xml,pseudostreaming/build.xml,rtmp/build.xml,securestreaming/build.xml, \
sharing/build.xml,slowmotion/build.xml,smil/build.xml,viralvideos/build.xml,securedrm/build.xml, \
bitrateselect/build.xml,menu/build.xml,cluster/build.xml
plugin.buildfiles=controls/build.xml,bwcheck/build.xml,f4m/build.xml,httpstreaming/build.xml
jsplugins.buildfiles=controls/build.xml,embed/build.xml,ipad/build.xml,playlist/build.xml,bitrateselect/build.xml
......
......@@ -5,8 +5,8 @@
<property name="version-1" value="3"/>
<property name="version-2" value="2"/>
<property name="version-3" value="16"/>
<property name="version-status" value=""/>
<property name="version-3" value="17"/>
<property name="version-status" value="dev"/>
<property name="controls-version-info" value="3.2.15"/>
<property name="audio-version-info" value="3.2.10"/>
<property name="flowplayer-js-version-info" value="3.2.12"/>
......@@ -364,6 +364,7 @@
<attribute name="buildfiles" default="${plugin.buildfiles}"/>
<attribute name="basedirectory" default="${plugins.dir}"/>
<sequential>
<echo message="plugin buildfiles @{buildfiles}" />
<subant target="@{target}">
<fileset dir="@{basedirectory}" includes="@{buildfiles}"/>
<property name="remotedir" value="${remotedir}"/>
......
......@@ -795,9 +795,9 @@ package org.flowplayer.view {
}
CONFIG::commercialVersion {
addChildAt(_screenMask, 1);
//#75 set the child display list different when a gradient is set.
addChildAt(_screenMask, style.backgroundGradient ? 1 : 0);
}
//addChildAt(_screenMask, _canvasLogo ? 1 : 0);
log.debug("adding mask");
}
} else {
......
......@@ -78,15 +78,17 @@ package org.flowplayer.ui.tooltips {
}
this._stage = p.stage;
this._parentObject = p;
this.addCopy(title, content);
//#58 setup the parent global position early to configure the alignment of the tooltip.
var parentCoords:Point = new Point( _parentObject.x, _parentObject.y );
var globalPoint:Point = p.localToGlobal(parentCoords);
this.addCopy(title, content, globalPoint.x);
this.setOffset();
this.drawBG();
this.bgGlow();
//initialize coordinates
var parentCoords:Point = new Point( _parentObject.x, _parentObject.y );
var globalPoint:Point = p.localToGlobal(parentCoords);
this.x = globalPoint.x + this._offSet;
this.y = globalPoint.y - this.height - 5;
......@@ -158,7 +160,7 @@ package org.flowplayer.ui.tooltips {
return new Point(x, 0);
}
private function addCopy( title:String, content:String ):void {
private function addCopy( title:String, content:String, parentPos:Number ):void {
if (_tf) {
removeChild(_tf);
}
......@@ -170,17 +172,18 @@ package org.flowplayer.ui.tooltips {
this._tf.alpha = _config.tooltipTextAlpha;
if( this._autoSize ){
setDefaultWidth();
if (_parentObject.x + _parentObject.width / 2 + _defaultWidth / 2 > _parentObject.stage.stageWidth) {
_align = "left";
} else if (_parentObject.x + _parentObject.width / 2 - _defaultWidth / 2 < 0) {
_align = "right";
//#58 use the corrdinates from the parent global position
if (parentPos + (_parentObject.width / 2) + (_defaultWidth / 2) > _parentObject.stage.stageWidth) {
_align = "right";
} else if (parentPos + _parentObject.width / 2 - _defaultWidth / 2 < 0) {
_align = "left";
} else {
_align = "center";
}
}else{
this._tf.width = this._defaultWidth - ( _buffer * 2 );
}
this._tf.x = this._tf.y = this._buffer;
this.textGlow( this._tf );
addChild( this._tf );
......@@ -359,7 +362,7 @@ package org.flowplayer.ui.tooltips {
default:
this._offSet = - ( _defaultWidth / 2 );
this._hookOffSet = ( _defaultWidth / 2 );;
this._hookOffSet = ( _defaultWidth / 2 );
break;
}
}
......
# you need to adjust following to point to your Flex SDK
flexdir=/Users/api/flex_sdk_4.5.0.19786
flexdir=/Users/api/flex_sdk_4_6
# change this if you want the compiled plugin to be copied to some dir
deploy_dir=../../core
......
###------------------------------------------------------------###
# Edit the following parameters with valid values. #
# #
# OBS. When adding a path value use only forward slashes(/) #
# or double the backward slashed(\\) #
###------------------------------------------------------------###
# File contains default values of properties used in build
# * When adding a path value use only forward slashes(/) or double the
# backward slashed(\\)
#### general parameters
player.version=1.6
ant.home=C:/ant
source.dir=${basedir}
trunk.dir=${basedir}
#### flex compiler parameters
buildtools.dir=${source.dir}/buildtools
buildtools.dir=${trunk.dir}/buildtools
FLEX_HOME=${buildtools.dir}/sdks/4.5.1
FLEX_UNIT_HOME=${buildtools.dir}/flexunit
#### destination folders
dist.dir=${basedir}/dist
smp.dist.dir=${dist.dir}/player/
reports.dir=${dist.dir}/test-reports/
# location of directory where test reports will be saved
# reports.dir=${basedir}/test-reports/
# Note. By default test reports will be saved in ${testProjectDir}/test-reports
#### build parameters for flash player
......
......@@ -12,18 +12,14 @@
<!-- main -->
<target name="all">
<antcall target="clean.bin" />
<antcall target="init" />
<antcall target="build" />
<antcall target="test" />
<antcall target="dist" />
<antcall target="source" />
</target>
<!-- build entire project -->
<target name="build">
<sequential>
<antcall target="compile.osmf" />
<antcall target="compile.osmf" />
<antcall target="compile.libs" />
<antcall target="compile.smp" />
<antcall target="compile.extended" />
......@@ -33,27 +29,25 @@
<!-- compile framework and compile and run framework tests -->
<target name="core" depends="compile.osmf">
<subant target="build" inheritall="true" antfile="testing/NetMockerLibrary/build.xml" buildpath="."/>
<subant target="run" inheritall="true" antfile="framework/OSMFTest/build.xml" buildpath="."/>
<!-- <subant target="run" inheritall="true" antfile="framework/OSMFIntegrationTest/build.xml" buildpath="."/> -->
</target>
<!-- compile strobe media player and compile and run coresponding tests -->
<target name="player" depends="compile.smp">
<subant target="build" inheritall="true" antfile="testing/NetMockerLibrary/build.xml" buildpath="."/>
<subant target="run" inheritall="true" antfile="player/StrobeMediaPlaybackTest/build.xml" buildpath="."/>
</target>
<!-- run all project available tests -->
<target name="test">
<antcall target="run.unittests" />
<!-- <antcall target="run.integrationtests" /> -->
</target>
<!-- ========= subtargets ========= -->
<!-- creates output dirs -->
<target name="init">
<mkdir dir="${dist.dir}" />
<mkdir dir="${smp.dist.dir}" />
</target>
<!-- compiles osmf framework -->
<target name="compile.osmf">
<subant target="" inheritall="true" antfile="framework/OSMF/build.xml" buildpath="."/>
......@@ -66,11 +60,10 @@
</target>
<!-- compiles libraries -->
<!-- OBS. when adding a new libarary make sure you solve all the dependencies with other libraries -->
<!-- OBS. when adding a new library make sure you solve all the dependencies with other libraries -->
<target name="compile.libs">
<sequential>
<subant target="" inheritall="true">
<property name="source.dir" value="${source.dir}"/>
<fileset dir="." includes="*/VPAIDLibrary/build.xml" />
<fileset dir="." includes="*/*Library/build.xml" excludes="*VPAID*"/>
<fileset dir="." includes="testing/*Library/build.xml"/>
......@@ -117,52 +110,23 @@
<sequential>
<subant target="run" inheritall="true" antfile="framework/OSMFTest/build.xml" buildpath="."/>
<subant target="run" inheritall="true" antfile="player/StrobeMediaPlaybackTest/build.xml" buildpath="."/>
<!--
<subant target="run" inheritall="true" antfile="testing/NetMockerTest/build.xml" buildpath="."/>
<subant target="run" inheritall="true" antfile="samples/YouTubePluginTest/build.xml" buildpath="."/>
<subant target="run" inheritall="true" antfile="samples/YouTubePluginTest/build.xml" buildpath="."/>
<fileset dir="." includes="testing/certification/ZeriCertificationTest/build.xml"/>
-->
</sequential>
</target>
<!-- creates distribuition for the entire porject -->
<target name="dist">
<antcall target="osmf.dist" />
<antcall target="smp.dist" />
</target>
<target name="osmf.dist">
<copy todir="${dist.dir}" overwrite="true" failonerror="false">
<fileset dir="${basedir}" includes="/framework/OSMF/${output.bin}/**" />
<fileset dir="${basedir}" includes="/**/*Sample*/${output.bin}/**" />
<fileset dir="${basedir}" includes="/**/*Plugin*/${output.bin}/**" />
<regexpmapper from="(.*)/${output.bin}/(.*)" to="\2" handledirsep="true"/>
</copy>
<copy todir="${dist.dir}/Test" overwrite="true" failonerror="false">
<fileset dir="${basedir}" includes="/**/*Test*/${output.bin}/**" />
<regexpmapper from="(.*)/${output.bin}/(.*)" to="\2" handledirsep="true"/>
</copy>
<copy todir="${dist.dir}/Zeri" overwrite="true" failonerror="false">
<fileset dir="${basedir}" includes="/**/**/*Zeri*/${output.bin}/**" />
<regexpmapper from="(.*)/${output.bin}/(.*)" to="\2" handledirsep="true"/>
</copy>
</target>
<target name="smp.dist">
<copy todir="${smp.dist.dir}" overwrite="true" failonerror="false">
<fileset dir="${basedir}" includes="/player/**/${output.bin}/**" />
<fileset dir="${basedir}" includes="/framework/OSMF/${output.bin}/**" />
<fileset dir="${basedir}" includes="/**/YouTubePlugin/${output.bin}/**" />
<fileset dir="${basedir}" includes="/**/YouTubePluginTest/${output.bin}/**" />
<fileset dir="${basedir}" includes="/**/MASTPlugin/${output.bin}/**" />
<regexpmapper from="(.*)/${output.bin}/(.*)" to="\2" handledirsep="true"/>
</copy>
<!-- runs integration tests -->
<!--
<target name="run.integrationtests" >
<sequential>
<subant target="run" inheritall="true" antfile="framework/OSMFIntegrationTest/build.xml" buildpath="."/>
</sequential>
</target>
-->
<target name="source">
<zip destfile="${dist.dir}/OSMF_src.zip">
<zipfileset dir="${basedir}" prefix="OSMF" excludes="dist/**, build/**, **/bin/**, **/bin-*/**, **/generated/**, **/buildtools/**" />
</zip>
</target>
<!-- deletes the output directories -->
<target name="clean">
<sequential>
......@@ -173,34 +137,14 @@
<include name="samples/**/bin/**" />
<include name="testing/**/bin/**" />
<include name="**/bin-*/**" />
<include name="**/generated/**" />
<include name="*version.txt" />
<include name="**/*Test*/test-reports/**" />
<include name="**/*Test/test-reports/**" />
<exclude name="buildtools/**" />
</fileset>
</delete>
<delete includeemptydirs="true" quiet="true">
<fileset dir="${dist.dir}" />
<fileset dir="${smp.dist.dir}" />
<fileset dir="${reports.dir}" />
</delete>
</sequential>
</target>
<!-- deletes the content of the output directories -->
<target name="clean.bin">
<sequential>
<delete includeemptydirs="true" quiet="true">
<fileset dir="${basedir}" defaultexcludes="false">
<include name="framework/**/bin/**/*" />
<include name="player/**/bin/**/*" />
<include name="samples/**/bin/**/*" />
<include name="testing/**/bin/**/*" />
<include name="**/bin-*/**/*" />
<include name="**/generated/**" />
</fileset>
</delete>
</sequential>
</target>
</project>
<?xml version="1.0"?>
<antlib>
<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="asdoc" classname="flex.ant.AsDocTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="flex" classname="flex.ant.FlexTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="flexunit" classname="org.flexunit.ant.tasks.FlexUnitTask" classpath="${FLEX_UNIT_HOME}/flexUnitTasks-4.1.0-8.jar" onerror="ignore" />
<taskdef name="propertyregex" classname="net.sf.antcontrib.property.RegexTask" classpath="${buildtools.dir}/libs/ant-contrib-1.0b3.jar" onerror="ignore" />
<?xml version="1.0"?>
<antlib>
<taskdef name="mxmlc" classname="flex.ant.MxmlcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="html-wrapper" classname="flex.ant.HtmlWrapperTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="asdoc" classname="flex.ant.AsDocTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="compc" classname="flex.ant.CompcTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="flex" classname="flex.ant.FlexTask" classpath="${FLEX_HOME}/ant/lib/flexTasks.jar" />
<taskdef name="flexunit" classname="org.flexunit.ant.tasks.FlexUnitTask" classpath="${FLEX_UNIT_HOME}/flexUnitTasks-4.1.0-8.jar" onerror="ignore" />
<taskdef name="propertyregex" classname="net.sf.antcontrib.property.RegexTask" classpath="${buildtools.dir}/libs/ant-contrib-1.0b3.jar" onerror="ignore" />
</antlib>
\ No newline at end of file
......
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