Commit 3223e796 authored by Anssi Piirainen's avatar Anssi Piirainen
Browse files

Merge pull request #158 from flowplayer/bug/139

Don’t use the audio provider (and automatically load the plugin) if a pr...
parents a477f0f3 7cc13519
......@@ -670,6 +670,7 @@ package org.flowplayer.model {
[Value]
public function get provider():String {
if (_clipObject && _clipObject.hasOwnProperty("provider")) return _clipObject.provider;
if (type == ClipType.AUDIO && _provider == "http") return "audio";
if (_url && _url.toLowerCase().indexOf("rtmp") == 0 && _provider == "http") return "rtmp";
if (parent) return _provider + "Instream";
......
<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 -->
......@@ -16,9 +16,9 @@
id="player">
</a>
<script>
flowplayer("player", "../build/flowplayer-3.2.11.swf",
flowplayer("player", "../../../flash-build/build/flowplayer.swf",
{
log: { level: 'debug', filter: 'org.flowplayer.controls.scrubber.ScrubberSlider, org.flowplayer.audio.*' },
// log: { level: 'debug', filter: 'org.flowplayer.controller.MediaControllerFactory' },
onBegin: function() {
console.log("onBegin");
......@@ -57,6 +57,7 @@
url: "http://releases.flowplayer.org/data/national.jpg",
scaling: 'orig'
}
, provider: 'http'
}
// plugins: {
......
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