Commit 693cea58 authored by Anssi Piirainen's avatar Anssi Piirainen
Browse files

changes for release 3.2.16

parent 06c77954
Version history:
3.2.15
3.2.16
------
- #15 fixes for #627, handle the display init on startup.
- #615 dispatch begin if in paused mode too early.
......@@ -9,12 +9,12 @@ Version history:
- #42 pass in stream clips through and close the stream before returning to the parent clip.
- #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.
- 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.
- #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.14
3.2.15
------
- #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.
......
......@@ -18,9 +18,11 @@ deploy.dir=${site.dir}/content/swf
#plugin.buildfiles=rtmp/build.xml
#
plugin.buildfiles=pseudostreaming/build.xml,controls/build.xml,controls/build-tube.xml,controls/build-air.xml,controls/build-skinless.xml, \
bitrateselect/build.xml,menu/build.xml,bwcheck/build.xml,viralvideos/build.xml,sharing/build.xml,bwcheck/build-httpstreaming.xml
# 3.2.16
plugin.buildfiles=rtmp/build.xml,controls/build.xml,controls/build-tube.xml,controls/build-air.xml,controls/build-skinless.xml, \
sharing/build.xml,viralvideos/build.xml,bitrateselect/build.xml,bwcheck/build.xml, \
httpstreaming/build.xml,menu/build.xml,pseudostreaming/build.xml
#
#plugin.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, \
......
......@@ -9,7 +9,7 @@
<property name="version-status" value="dev"/>
<property name="controls-version-info" value="3.2.15-dev"/>
<property name="audio-version-info" value="3.2.10"/>
<property name="flowplayer-js-version-info" value="3.2.11"/>
<property name="flowplayer-js-version-info" value="3.2.12-dev"/>
<property name="source-dist-root-folder" value="flowplayer"/>
<property name="version-status-quoted" value="&quot;&#39;${version-status}&#39;&quot;"/>
......
......@@ -150,7 +150,9 @@
</target>
<target name="generate-url-file" description="generates a text file with paths to plugin zip files in flowplayer.org">
<property name="url-file" value="${core-dir}/dist/dist.html" />
<!--<property name="url-file-from-plugins" value="${basedir}/dist/dist.html" />-->
<property name="url-file" value="${basedir}/dist/dist.html" />
<delete file="${url-file}" />
<echo message="writing zip urls to ${url-file}" />
......
......@@ -116,7 +116,7 @@ package org.flowplayer.view {
addItem(menu, new ContextMenuItem("Flowplayer comes without any warranty", false, false));
// 3 Link to license
addItem(menu, new ContextMenuItem("GNU GENERAL PUBLIC LICENSE...", false, true), function(event:ContextMenuEvent):void {
navigateToURL(new URLRequest("http://flowplayer.org/license_gpl.html"), "_self");
navigateToURL(new URLRequest("http://flowplayer.org/license/"), "_self");
});
return menu;
}
......
......@@ -152,19 +152,21 @@ package org.flowplayer.controller {
clip.startDispatched = false;
//#50 clear metadata when replaying in a playlist
clip.metaData = false;
log.debug("previously started clip " + _startedClip);
if (attempts == 3 && _startedClip && _startedClip == clip && _connection && _netStream) {
log.info("playing previous clip again, reusing existing connection and resuming");
_started = false;
replay(clip);
} else {
log.debug("will create a new connection");
_startedClip = clip;
log.debug("will create a new connection");
_startedClip = clip;
connect(clip);
//#50 clear metadata when replaying in a playlist
if (clip.metaData != false) {
clip.metaData = null;
}
connect(clip);
}
}
......@@ -856,31 +858,9 @@ package org.flowplayer.controller {
_stopping = true;
if (clip.live) {
_netStream.close();
_netStream = null;
this.closeStreamAndConnection(netStream);
} else if (closeStreamAndConnection) {
_startedClip = null;
log.debug("doStop(), closing netStream and connection");
if (clip.getContent() is Video) {
Video(clip.getContent()).clear();
}
try {
netStream.close();
_netStream = null;
} catch (e:Error) {
}
if (_connection) {
_connection.close();
_connection = null;
}
dispatchPlayEvent(ClipEventType.BUFFER_STOP);
// clip.setContent(null);
this.closeStreamAndConnection(netStream);
} else {
silentSeek = true;
//#9 when replaying from stopping, connection does not receive callbacks anymore.
......@@ -891,8 +871,30 @@ package org.flowplayer.controller {
dispatchEvent(event);
}
private function _createNetStream():void {
_netStream = createNetStream(_connection) || new NetStream(_connection);
private function closeStreamAndConnection(netStream:NetStream):void {
_startedClip = null;
log.debug("doStop(), closing netStream and connection");
if (clip.getContent() is Video) {
Video(clip.getContent()).clear();
}
try {
netStream.close();
_netStream = null;
} catch (e:Error) {
}
if (_connection) {
_connection.close();
_connection = null;
}
dispatchPlayEvent(ClipEventType.BUFFER_STOP);
}
private function _createNetStream():void {
_netStream = createNetStream(_connection) || new NetStream(_connection);
netStream.client = new NetStreamClient(clip, _player.config, _streamCallbacks);
_netStream.bufferTime = clip.bufferLength;
_volumeController.netStream = _netStream;
......
......@@ -500,6 +500,7 @@ package org.flowplayer.model {
}
public function set metaData(metaData:Object):void {
log.debug("received metadata", metaData);
this._metaData = metaData;
}
......
......@@ -2,10 +2,10 @@
<!-- projet name is used as a base name for distribution files -->
<project name="flowplayer" default="min">
<property name="DEVKIT_HOME" value="../../../../../lib/devkit"/>
<property name="DEVKIT_HOME" value="../../../../lib/devkit"/>
<import file="${DEVKIT_HOME}/js.xml"/>
<property name="version" value="3.2.11"/>
<property name="version" value="3.2.12-dev"/>
<!-- concat -->
<target name="concat">
......
<html><head>
<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="../src/javascript/flowplayer.js/flowplayer-3.2.11.min.js"></script>
<!-- page title -->
<title>Minimal Flowplayer setup</title>
</head><body>
<div id="page">
<a
href="http://pseudo01.hddn.com/vod/demo.flowplayervod/flowplayer-700.flv"
style="display:block;width:440px;height:247px"
id="player">
</a>
<script>
flowplayer("player", "../build/flowplayer.swf",
{
log: { level: 'debug', filter: 'org.flowplayer.rtmp.*' },
clip: {
provider: 'rtmp',
// bufferLength: 5,
url:'black-beatz',
live: true,
onStart: function() {
console.log("onStart");
},
onFinish: function() {
console.log("onFinish");
},
onBeforePause: function() {
console.log("onBeforePause");
// $f().stopBuffering();
},
onPause: function() {
console.log("onPause");
},
onBeforeResume: function() {
console.log("onBeforeResume");
},
onResume: function() {
console.log("onResume");
},
onStop: function() {
console.log("onStop");
$f().close();
}
},
plugins:
{
rtmp: {
url: 'flowplayer.rtmp.swf',
netConnectionUrl: "rtmp://stream-6.antenne.de:80/live",
failOverDelay: 4000,
connectionTimeout: 10000
}
}
});
</script>
</div>
</body></html>
\ No newline at end of file
<html><head>
<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="../src/javascript/flowplayer.js/flowplayer-3.2.11.min.js"></script>
<!-- page title -->
<title>Minimal Flowplayer setup</title>
</head><body>
<div id="page">
<a
href="http://pseudo01.hddn.com/vod/demo.flowplayervod/flowplayer-700.flv"
style="display:block;width:440px;height:247px"
id="player">
</a>
<script>
flowplayer("player", "../build/flowplayre.comm.swf",
{
log: { level: 'debug', filter: 'org.flowplayer.rtmp.*' },
clip: {
provider: 'rtmp',
// bufferLength: 5,
url:'black-beatz',
live: true,
onStart: function() {
console.log("onStart");
},
onFinish: function() {
console.log("onFinish");
},
onBeforePause: function() {
console.log("onBeforePause");
// $f().stopBuffering();
},
onPause: function() {
console.log("onPause");
},
onBeforeResume: function() {
console.log("onBeforeResume");
},
onResume: function() {
console.log("onResume");
},
onStop: function() {
console.log("onStop");
$f().close();
}
},
plugins:
{
rtmp: {
url: 'flowplayer.rtmp.swf',
netConnectionUrl: "rtmp://stream-7.antenne.de:80/liveedge",
failOverDelay: 4000,
connectionTimeout: 10000
}
}
});
</script>
</div>
</body></html>
\ No newline at end of file
<html><head>
<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.11.min.js"></script>
<!-- page title -->
......@@ -11,7 +10,7 @@
<div id="page">
<a
href="N9m/See/N9mSeeexq.flv"
href=""
style="display:block;width:440px;height:247px"
id="player">
</a>
......@@ -37,7 +36,7 @@
clip: {
url: 'mp4:Maria_210557.mp4',
url: '000F7F/movietrailers/Skyfall.mp4',
provider: 'rtmp',
autoPlay: false,
autoBuffering:true
......@@ -45,8 +44,8 @@
plugins: {
rtmp: {
url: 'flowplayer.rtmp.swf',
netConnectionUrl: 'rtmp://stream1.nelonen.fi/vod/'
url: 'http://releases.flowplayer.org/rtmp/flowplayer.rtmp.swf',
netConnectionUrl: 'rtmp://fms.0F7F.planetstream.net'
}
}
});
......
......@@ -18,9 +18,9 @@
id="player">
</a>
<script>
flowplayer("player", "../build/flowplayer.commercial.swf",
flowplayer("player", "../build/flowplayer.swf",
{
log: { level: 'debug', filter: 'org.flowplayer.controls.scrubber.ScrubberSlider'},
log: { level: 'debug', filter: 'org.flowplayer.view.Screen'},
key: '#$b6223bfbd646c621758',
......@@ -69,7 +69,7 @@
},
playlist: [
"http://stream.flowplayer.org/Extremists.flv"
"http://stream.flowplayer.org/flowplayer-700.flv"
],
clip: {
......@@ -77,27 +77,12 @@
// duration: 20,
bufferLength: 10,
autoPlay: true,
autoBuffering:true
autoBuffering: true
// ,
// duration: 20
},
plugins: {
controls: {
url: 'flowplayer.controls.swf',
playlist: true,
scrubber: {
backgroundColor: 0
},
autoHide: false
}
// content: {
// url: 'flowplayer.content.swf',
// html: '<img src="../build/play.png" width="100" height="100"/>',
// height: 200
// }
}
});
</script>
</div>
......
<html><head>
<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.11.min.js"></script>
<!-- page title -->
......@@ -18,27 +18,53 @@
<script>
flowplayer("player", "../build/flowplayer.swf",
{
log: { level: 'debug', filter: 'org.flowplayer.bwcheck.*' },
onStart: function() {
console.log("onStart");
},
log: { level: 'debug', filter: 'org.flowplayer.rtmp.*' },
onFinish: function() {
console.log("onFinish");
},
clip: {
provider: 'rtmp',
// bufferLength: 5,
url:'black-beatz',
live: true,
onPause: function() {
console.log("onPause");
},
onStart: function() {
console.log("onStart");
},
onResume: function() {
console.log("onResume");
},
onFinish: function() {
console.log("onFinish");
},
onBeforePause: function() {
console.log("onBeforePause");
// $f().stopBuffering();
},
onPause: function() {
console.log("onPause");
},
onBeforeResume: function() {
console.log("onBeforeResume");
},
onResume: function() {
console.log("onResume");
},
onStop: function() {
console.log("onStop");
$f().close();
}
clip: {
},
plugins:
{
rtmp: {
url: 'flowplayer.rtmp.swf',
netConnectionUrl: "rtmp://stream-7.antenne.de:80/liveedge",
failOverDelay: 4000,
connectionTimeout: 10000
}
}
});
......
......@@ -9,6 +9,7 @@
<equals arg1="${shortname}" arg2="flowplayer"/>
</condition>
<property name="devkit-dir" value="../../../../lib/devkit" />
<property name="source.file" value="${basedir}/${basename}.js"/>
<property name="rhino" value="${DEVKIT_HOME}/lib/rhino.jar"/>
<property name="yui.path" value="${DEVKIT_HOME}/lib/yuicompressor-2.4.2.jar"/>
......
......@@ -303,6 +303,7 @@
<target name="write-zip-url">
<echo message="writing to ${url-file}" />
<echo file="${url-file}" append="true">&#60;a href="http://flowplayer-releases.s3.amazonaws.com/${basename}/${basename}.zip"&#62;${basename}.zip&#60;/a&#62; &#60;br /&#62;
</echo>
</target>
......
......@@ -4,7 +4,6 @@ Version history:
-----
- Refactored to changes in the google analytics library for Bridge mode support. Debug view support is removed but with the option of a build build. Reinstating the trackingObj config
to configure the bridge mode.
TODO: May require V5 async support. _gat._getTracker is deprecated use _gat._createTracker instead.
3.2.8
-----
......
version=3.2.8
version=3.2.9-dev
devkit-dir=../../lib/devkit
Version history:
3.2.14
------
- Added helper methods to hide / show the dock when autohide is enabled or not, issue #60
3.2.13
------
- #7 add start event filter for clips with bitrateitems as well as bitrateselect resolver checks.
......
devkit-dir=../../lib/devkit
version=3.2.13
version=3.2.13-dev
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