Permalink
Browse files

Update flowplayer from 3.0.5 to 3.1.5. Related ticket: #1126.

Note: Using the JavaScript code from version 3.1.4 since that's the latest version for which the non-minified source is available.
  • Loading branch information...
1 parent 6ec9bcd commit 9fdfa69d33f1e12af980d0460fc755d33cbe8ae6 @andyst andyst committed Apr 30, 2010
View
@@ -2,12 +2,12 @@ DESCRIPTION
-----------
upstream:
- 1) a pure copy of the 3.0.5 version of Flowplayer
- 2) a copy of the h264 streaming code from http://h264.code-shop.com/trac/wiki/FlowPlayer.
- Note: On the next update, switch from this plugin to flowplayer's
- official pseudostreaming plugin.
- 3) a copy of tools.flashembed-1.0.4.js (non-minified version) from
- http://flowplayer.org/tools/download.html
+ 1) a copy of the 3.1.5 version of Flowplayer
+ 2) a copy of the latest pseudostreaming plugin (v3.1.3)
+ 3) the source of tools.flashembed-1.0.4.js (non-minified version)
+ from http://flowplayer.org/tools/download.html
+ 4) the source of flowplayer-3.1.4.js (latest available version
+ of the source) from http://flowplayer.org/tools/download.html.
UPDATING
--------

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -1,14 +1,50 @@
-The FlowPlayer Free version is released under GNU GENERAL PUBLIC LICENSE
-Version 3 (GPL).
+The Flowplayer Free version is released under the
+GNU GENERAL PUBLIC LICENSE Version 3 (GPL).
-Note that the GPL requires that you don't remove the Flowpayer copyright notices
+The GPL requires that you not remove the Flowplayer copyright notices
from the user interface. See section 5.d below.
-Commercial licenses are available. The commercial player version does
-not have any Flowplayer logos or texts.
+Commercial licenses are available. The commercial player version
+does not require any Flowplayer notices or texts and also provides
+some additional features.
========================================================================
+ADDITIONAL TERM per GPL Section 7
+If you convey this program (or any modifications of it) and assume
+contractual liability for the program to recipients of it, you agree
+to indemnify Flowplayer, Ltd. for any liability that those contractual
+assumptions impose on Flowplayer, Ltd.
+
+Except as expressly provided herein, no trademark rights are granted in
+any trademarks of Flowplayer, Ltd. Licensees are granted a limited,
+non-exclusive right to use the mark Flowplayer and the Flowplayer logos
+in connection with unmodified copies of the Program and the copyright
+notices required by section 5.d of the GPL license. For the purposes
+of this limited trademark license grant, customizing the Flowplayer
+by skinning, scripting, or including PlugIns provided by Flowplayer, Ltd.
+is not considered modifying the Program.
+
+Licensees that do modify the Program, taking advantage of the open-source
+license, may not use the Flowplayer mark or Flowplayer logos and must
+change the fullscreen notice (and the non-fullscreen notice, if that
+option is enabled), the copyright notice in the dialog box, and the
+notice on the Canvas as follows:
+
+the full screen (and non-fullscreen equivalent, if activated) notice
+should read: "Based on Flowplayer source code"; in the context menu
+(right-click menu), the link to "About Flowplayer free version #.#.#"
+can remain. The copyright notice can remain, but must be supplemented with
+an additional notice, stating that the licensee modified the Flowplayer.
+A suitable notice might read "Flowplayer Source code modified by ModOrg 2009";
+for the canvas, the notice should read "Based on Flowplayer source code".
+In addition, licensees that modify the Program must give the modified
+Program a new name that is not confusingly similar to Flowplayer and
+may not distribute it under the name Flowplayer.
+
+========================================================================
+
+
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
@@ -1,5 +1,103 @@
Version history:
+3.1.5
+-----
+Fixes:
+- The player went to a locked state when resuming playback after a period that was long enought to send the
+netConnection to an invalid state. Now when resuming playback on an invalid connection the clip starts again from
+the beginning. This is only when using RTMP connections and does not affect progressive download playback.
+- Custom netConnect and netStream events did not pass the info object to JS listeners
+
+3.1.4
+-----
+Fixes:
+- player did not initialize if the controlbar plugin was disabled and if the play button overlay was disabled with play: null
+- works properly without cachebusting on IE
+- RSS playlist parsing now respects the isDefault attribute used in mRSS media group items
+- Fixed passing of connection arguments
+
+3.1.3
+-----
+- enhancements to RSS playlist parsing: Now skips all media:content that have unsupported types. Now the type attribute
+of the media:content element is mandatory and has to be present in the RSS file
+- Possibility to pass a RSS file name with playFeed("playlist.rss") and setPlaylist("playlist.rss") calls.
+- changes to the ConnectionProvider and URLResolver APIs
+- Now automatically uses a plugin that is called 'rtmp' for all clips that have the rtmp-protocol in their URLs.
+- Added possibility to specify all clip properties in an RSS playlist
+
+Fixes:
+- the result of URL resolvers in now cached, and the resolvers will not be used again when a clip is replayed
+- some style properties like 'backgroundGradient' had no effect in config
+- video goes tiny on Firefox: http://flowplayer.org/forum/8/23226
+- RSS playlists: The 'type' attribute value 'audio/mp3' in the media:content element caused an error.
+- Dispatches onMetadata() if an URL resolver changes the clip URL (changes to a different file)
+- error codes and error message were not properly passed to onEvent JS listeners
+
+3.1.2
+-----
+- The domain of the logo url must the same domain from where the player SWF is loaded from.
+- Fullscreen can be toggled by doublclick on the video area.
+Fixes:
+- Player was not initialized correctly when instream playlists were used and the provider used in the instream clips was defined in the common clip.
+- A separator in the Context Menu made the callbacks in the following menu items out of order. Related forum post: http://flowplayer.org/forum/8/22541
+- the width and height settings of a logo were ignored if the logo was a sWF file
+- volume control and mute/unmute were not working after an instream clip had been played
+- now possible to use RTMP for mp3 files
+- Issue 12: cuepointMultiplier was undefined in the clip object set to JS event listeners
+- Issue 14: onBeforeStop was unnecessarily fired when calling setPlaylist() and the player was not playing,
+ additionally onStop was never fired even if onBeforeStop was
+- fixed screen vertical placement problems that reappeared with 3.1.1
+- The rotating animation now has the same size and position as it has after initialized
+
+3.1.1
+-----
+- External configuration files
+- Instream playback
+- Added toggleFullscreen() the API
+- Possibility to specify controls configuration in clips
+- Seek target position is now sent in the onBeforeSeek event
+Fixes:
+- The screen size was initially too small on Firefox (Mac)
+- Did not persist a zero volume value: http://www.flowplayer.org/forum/8/18413
+
+3.1.0
+-----
+New features:
+- clip's can have urlResolvers and connectionProviders
+- Added new configuration options 'connectionCallbacks' and 'streamCallbacks'. Both accept an Array of event names as a value.
+ When these events get fired on the connection or stream object, corresponding Clip events will be fired by the player.
+ This can be used for example when firing custom events from RTMP server apps
+- Added new clip event types: 'onConnectionEvent' and 'onStreamEvent' these get fired when the predefined events happen on the connection and stream objects.
+- Added Security.allowDomain() to allow loaded plugins to script the player
+- Added addClip(clip, index) to the API, index is optional
+- Possibility to view videos without metadata, using clip.metaData: false
+- Now the player's preloader uses the rotating animation instead of a percent text to indicate the progress
+ of loading the player SWF. You can disable the aninamtion by setting buffering: false
+- calling close() now does not send the onStop event
+- Clip's custom properties are now present in the root of the clip argument in all clip events that are sent to JS.
+
+Bug fixes:
+- The preloader sometimes failed to initialize the player
+- Allow seeking while in buffering state: http://flowplayer.org/forum/8/16505
+- Replay of a RTMP stream was failing after the connection had expired
+- Security error when clicking on the screen if there is an image in the playlist loaded from a foreign domain
+- loadPlugin() was not working
+- now fullscreen works with Flash versions older than 9.0.115, in versions that do not support hardware scaling
+- replaying a RTMP stream with an image in front of the stream in the playlist was not working (video stayed hidden). Happened
+ because the server does not send metadata if replaying the same stream.
+- the scrubber is disabled if the clip is not seekable in the first frame: http://flowplayer.org/forum/8/16526
+ By default if the clip has one of following extensions (the typical flash video extensions) it is seekable
+ in the first frame: 'f4b', 'f4p', 'f4v', 'flv'. Added new clip property seekableOnBegin that can be used to override the default.
+
+3.0.6
+-----
+- added possibility to associate a linkUrl and linkWindow to the canvas
+Fixes:
+- fix for entering fullscreen for Flash versions that don't support the hardware scaled fullscreen-mode
+- when showing images the duration tracking starts only after the image has been completely loaded: http://flowplayer.org/forum/2/15301
+- fix for verifying license keys for domains that have more than 4 labels in them
+- if plugin loading failis because of a IO error, the plugin will be discarded and the player initialization continues:
+
3.0.4
-----
- The "play" pseudo-plugin now supports fadeIn(), fadeOut(), showPlugin(), hidePlugin() and
@@ -14,6 +112,10 @@ Version history:
- Added copyright notices and other GPL required entries to the user interface
Fixes:
+- clip urls were not resolved correctly if the HTML page URL had a query string starting with a question mark (http://flowplayer.org/forum/8/14016#post-14016)
+- Fixed context menu for with IE (commercial version)
+- a cuepoint at time zero was fired several times
+- screen is now arranged correctly even when only bottom or top is defined for it in the configuration
- Fixed context menu for with IE (commercial version)
- a cuepoint at time zero was fired several times
- screen is now arranged correctly even when only bottom or top is defined for it in the configuration

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -1,74 +0,0 @@
-<html><head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<!-- A minimal Flowplayer setup to get you started -->
-
-
- <!--
- include flowplayer JavaScript file that does
- Flash embedding and provides the Flowplayer API.
- -->
- <script type="text/javascript" src="flowplayer-3.0.5.min.js"></script>
-
- <!-- some minimal styling, can be removed -->
- <link rel="stylesheet" type="text/css" href="style.css">
-
- <!-- page title -->
- <title>Minimal Flowplayer setup</title>
-
-</head><body>
-
- <div id="page">
-
- <h1>Minimal Flowplayer setup</h1>
-
- <p>View commented source code to get familiar with Flowplayer installation.</p>
-
- <!-- this A tag is where your Flowplayer will be placed. it can be anywhere -->
- <a
- href="http://blip.tv/file/get/KimAronson-TwentySeconds73213.flv"
- style="display:block;width:400px;height:300px"
- id="player">
- </a>
-
- <!-- this will install flowplayer inside previous A- tag. -->
- <script>
- flowplayer("player", "../flowplayer-3.0.5.swf");
- </script>
-
-
-
- <!--
- after this line is purely informational stuff.
- does not affect on Flowplayer functionality
- -->
-
- <p>
- If you are running these examples <strong>locally</strong> and not on some webserver you must edit your
- <a href="http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html">
- Flash security settings</a>.
- </p>
-
- <p class="less">
- Select "Edit locations" &gt; "Add location" &gt; "Browse for files" and select
- flowplayer-x.x.x.swf you just downloaded.
- </p>
-
-
- <h2>Documentation</h2>
-
- <p>
- <a href="http://beta.flowplayer.org/documentation/installation.html">Flowplayer installation</a>
- </p>
-
- <p>
- <a href="http://beta.flowplayer.org/documentation/configuration.html">Flowplayer configuration</a>
- </p>
-
- <p>
- See this identical page on <a href="http://beta.flowplayer.org/demos/example/index.htm">Flowplayer website</a>
- </p>
-
- </div>
-
-
-</body></html>
@@ -1,41 +0,0 @@
-
-body {
- background-color:#fff;
- font-family:"Lucida Grande","bitstream vera sans","trebuchet ms",verdana,arial;
- text-align:center;
-}
-
-#page {
- background-color:#efefef;
- width:600px;
- margin:50px auto;
- padding:20px 150px 20px 50px;
- min-height:600px;
- border:2px solid #fff;
- outline:1px solid #ccc;
- text-align:left;
-}
-
-h1, h2 {
- letter-spacing:-1px;
- color:#2D5AC3;
- font-weight:normal;
- margin-bottom:-10px;
-}
-
-h1 {
- font-size:22px;
-}
-
-h2 {
- font-size:18px;
-}
-
-.less {
- color:#999;
- font-size:12px;
-}
-
-a {
- color:#295c72;
-}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
-/*!
- * flowplayer.js @VERSION. The Flowplayer API
+/**
+ * flowplayer.js 3.1.4. The Flowplayer API
*
* Copyright 2009 Flowplayer Oy
*
@@ -18,8 +18,8 @@
* You should have received a copy of the GNU General Public License
* along with Flowplayer. If not, see <http://www.gnu.org/licenses/>.
*
- * Date: @DATE
- * Revision: @REVISION
+ * Date: 2009-02-25 21:24:29 +0000 (Wed, 25 Feb 2009)
+ * Revision: 166
*/
(function() {
@@ -568,7 +568,7 @@ function Player(wrapper, params, conf) {
if (api) {
api.fp_close();
- // fire unload only when API is present
+ // fire unload only
self._fireEvent("onUnload");
}
} catch (error) {}
@@ -676,7 +676,7 @@ function Player(wrapper, params, conf) {
},
getVersion: function() {
- var js = "flowplayer.js @VERSION";
+ var js = "flowplayer.js 3.1.4";
if (api) {
var ver = api.fp_getVersion();
ver.push(js);
@@ -925,7 +925,7 @@ function Player(wrapper, params, conf) {
if (wrapper.getAttribute("href", 2) && !conf.clip.url) {
conf.clip.url = wrapper.getAttribute("href", 2);
}
-
+
commonClip = new Clip(conf.clip, -1, self);
// playlist

0 comments on commit 9fdfa69

Please sign in to comment.