summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/flowplayer.controls.swfbin15977 -> 27007 bytes
-rw-r--r--lib/flowplayer.h264streaming.swfbin78371 -> 0 bytes
-rw-r--r--lib/flowplayer.js2
-rw-r--r--lib/flowplayer.swfbin92318 -> 110762 bytes
4 files changed, 1 insertions, 1 deletions
diff --git a/lib/flowplayer.controls.swf b/lib/flowplayer.controls.swf
index 09a27e8a..aacdcd30 100644
--- a/lib/flowplayer.controls.swf
+++ b/lib/flowplayer.controls.swf
Binary files differ
diff --git a/lib/flowplayer.h264streaming.swf b/lib/flowplayer.h264streaming.swf
deleted file mode 100644
index 13c17a92..00000000
--- a/lib/flowplayer.h264streaming.swf
+++ /dev/null
Binary files differ
diff --git a/lib/flowplayer.js b/lib/flowplayer.js
index d4b619c3..57f00e65 100644
--- a/lib/flowplayer.js
+++ b/lib/flowplayer.js
@@ -51,7 +51,7 @@ return playlist[index];},getCommonClip:function(){return commonClip;},getPlaylis
return plugin;},getScreen:function(){return self.getPlugin("screen");},getControls:function(){return self.getPlugin("controls");},getConfig:function(copy){return copy?clone(conf):conf;},getFlashParams:function(){return params;},loadPlugin:function(name,url,props,fn){if(typeof props=='function'){fn=props;props={};}
var fnId=fn?makeId():"_";self._api().fp_loadPlugin(name,url,props,fnId);var arg={};arg[fnId]=fn;var p=new Plugin(name,null,self,arg);plugins[name]=p;return p;},getState:function(){return api?api.fp_getState():-1;},play:function(clip,instream){function play(){if(clip!==undefined){self._api().fp_play(clip,instream);}else{self._api().fp_play();}}
if(api){play();}else{self.load(function(){play();});}
-return self;},getVersion:function(){var js="flowplayer.js @VERSION";if(api){var ver=api.fp_getVersion();ver.push(js);return ver;}
+return self;},getVersion:function(){var js="flowplayer.js 3.1.4";if(api){var ver=api.fp_getVersion();ver.push(js);return ver;}
return js;},_api:function(){if(!api){throw"Flowplayer "+self.id()+" not loaded when calling an API method";}
return api;},setClip:function(clip){self.setPlaylist([clip]);return self;},getIndex:function(){return playerIndex;}});each(("Click*,Load*,Unload*,Keypress*,Volume*,Mute*,Unmute*,PlaylistReplace,ClipAdd,Fullscreen*,FullscreenExit,Error,MouseOver,MouseOut").split(","),function(){var name="on"+this;if(name.indexOf("*")!=-1){name=name.substring(0,name.length-1);var name2="onBefore"+name.substring(2);self[name2]=function(fn){bind(listeners,name2,fn);return self;};}
self[name]=function(fn){bind(listeners,name,fn);return self;};});each(("pause,resume,mute,unmute,stop,toggle,seek,getStatus,getVolume,setVolume,getTime,isPaused,isPlaying,startBuffering,stopBuffering,isFullscreen,toggleFullscreen,reset,close,setPlaylist,addClip,playFeed").split(","),function(){var name=this;self[name]=function(a1,a2){if(!api){return self;}
diff --git a/lib/flowplayer.swf b/lib/flowplayer.swf
index 61d7f652..63f3934a 100644
--- a/lib/flowplayer.swf
+++ b/lib/flowplayer.swf
Binary files differ