Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara-flashplayer
mahara-flashplayer
Commits
319701d8
Commit
319701d8
authored
Dec 09, 2013
by
Anssi Piirainen
Browse files
Pump version numbers of all plugins. Everything will be released as part of the next release.
parent
4f301b03
Changes
25
Hide whitespace changes
Inline
Side-by-side
core/test/audio.html
View file @
319701d8
...
...
@@ -49,7 +49,7 @@
},
clip
:
{
url
:
"
http://releases.flowplayer.org/data
/fake_empire.mp3
"
,
url
:
"
file://Users/api/code/core/build
/fake_empire.mp3
"
,
// this style of configuring the cover image was added in audio
// plugin version 3.2.3
...
...
core/test/captions.ttml
0 → 100644
View file @
319701d8
<tt xml:lang="" xmlns="http://www.w3.org/ns/ttml">
<head>
<styling xmlns:tts="http://www.w3.org/ns/ttml#styling">
<style xml:id="s1" tts:color="white" />
</styling>
</head>
<body>
<div>
<p xml:id="subtitle1" begin="0.76s" end="3.45s">
Trololololo
</p>
<p xml:id="subtitle2" begin="5.0s" end="10.0s">
lalala
</p>
<p xml:id="subtitle3" begin="10.0s" end="16.0s">
Oh-hahaha-ho
</p>
</div>
</body>
</tt>
core/test/captions2.html
View file @
319701d8
...
...
@@ -45,9 +45,12 @@
clip
:
{
// here is our high quality movie
url
:
'
http://
pseudo01.hddn.com/vod/demo
.flowplayer
vod
/flowplayer-700.flv
'
,
url
:
'
http://
stream
.flowplayer
.org
/flowplayer-700.flv
'
,
// this is the SubRib file with captions info
// captionUrl: 'captions.ttml'
ttNamespace
:
'
http://www.w3.org/2006/10/ttaf1
'
,
captionUrl
:
'
http://releases.flowplayer.org/data/timedtext.xml
'
},
plugins
:
{
...
...
core/test/instream.html
View file @
319701d8
<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,14 +11,14 @@
<div
id=
"page"
>
<a
href=
"
flowplayer.flv
"
href=
"
boris.mp3
"
style=
"display:block;width:440px;height:247px"
id=
"player"
>
</a>
<script>
flowplayer
(
"
player
"
,
"
../build/flowplayer.swf
"
,
flowplayer
(
"
player
"
,
"
../
../../flash-build/
build/flowplayer
-3.2.17-dev
.swf
"
,
{
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.
controller.PlayingState
'
},
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.
audio.*
'
},
key
:
'
#$b6223bfbd646c621758
'
,
...
...
@@ -45,22 +45,28 @@
clip
:
{
// baseUrl for both parent and instream clips
baseUrl
:
'
http://
stream.flowplayer.org
'
,
baseUrl
:
'
http://
flowmac2:8000/
'
,
// duration for the parent clip
duration
:
10
,
// instream playlist
playlist
:
[
{
url
:
'
fake_empire.mp3
'
,
duration
:
10
,
position
:
0
,
provider
:
'
audioInstream
'
},
// in the middle of the parent clip (ie. "mid-roll") starting at
// 5 seconds
{
url
:
'
honda_accord.flv
'
,
duration
:
5
,
position
:
2
,
url
:
'
apunk.mp3
'
,
duration
:
5
,
position
:
2
,
provider
:
'
audioInstream
'
,
controls
:
{
all
:
false
,
volume
:
true
,
fullscreen
:
true
}
}
]
}
},
plugins
:
{
audioInstream
:
{
url
:
'
flowplayer.audio-3.2.11-dev.swf
'
}
}
});
</script>
</div>
...
...
core/test/live-rtmp.html
View file @
319701d8
...
...
@@ -16,15 +16,16 @@
id=
"player"
>
</a>
<script>
flowplayer
(
"
player
"
,
"
../build/flowplayer.swf
"
,
flowplayer
(
"
player
"
,
"
../
../../flash-build/
build/flowplayer.swf
"
,
{
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.rtmp.*
'
},
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.rtmp.
RTMPStreamProvider, org.flowplayer.controller.
*
'
},
clip
:
{
provider
:
'
rtmp
'
,
// bufferLength: 5,
url
:
'
black-beatz
'
,
url
:
'
ch1
'
,
live
:
true
,
bufferLength
:
0
,
onStart
:
function
()
{
console
.
log
(
"
onStart
"
);
...
...
@@ -53,7 +54,6 @@
onStop
:
function
()
{
console
.
log
(
"
onStop
"
);
$f
().
close
();
}
},
...
...
@@ -61,7 +61,7 @@
{
rtmp
:
{
url
:
'
flowplayer.rtmp.swf
'
,
netConnectionUrl
:
"
rtmp://
stream-6.antenne.de:80/live
"
,
netConnectionUrl
:
"
rtmp://
itv08.digizuite.dk/tv2b
"
,
failOverDelay
:
4000
,
connectionTimeout
:
10000
}
...
...
core/test/rtmp-test.html
View file @
319701d8
...
...
@@ -15,9 +15,13 @@
id=
"player"
>
</a>
<script>
flowplayer
(
"
player
"
,
"
../build/flowplayer.swf
"
,
flowplayer
(
"
player
"
,
"
../
../../flash-build/
build/flowplayer.swf
"
,
{
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.rtmp.*, org.flowplayer.controller.*
'
},
log
:
{
level
:
'
error
'
,
filter
:
'
org.flowplayer.rtmp.*, org.flowplayer.controller.*
'
},
onBegin
:
function
()
{
console
.
log
(
"
onBegin
"
);
},
onStart
:
function
()
{
console
.
log
(
"
onStart
"
);
},
...
...
@@ -36,16 +40,16 @@
clip
:
{
url
:
'
000F7F/movietrailers/Skyfall.mp4
'
,
url
:
'
mp4:buffalo_soldiers
'
,
provider
:
'
rtmp
'
,
autoPlay
:
false
,
//
autoPlay: false,
autoBuffering
:
true
},
plugins
:
{
rtmp
:
{
url
:
'
http://releases.flowplayer.org/rtmp/
flowplayer.rtmp.swf
'
,
netConnectionUrl
:
'
rtmp://
fms.0F7F.planetstream.ne
t
'
url
:
'
flowplayer.rtmp
-3.2.13-dev
.swf
'
,
netConnectionUrl
:
'
rtmp://
s3b78u0kbtx79q.cloudfront.net/cfx/s
t
'
}
}
});
...
...
core/test/sharing.html
View file @
319701d8
...
...
@@ -16,7 +16,7 @@
id=
"player"
>
</a>
<script>
flowplayer
(
"
player
"
,
"
../build/flowplayer.swf
"
,
flowplayer
(
"
player
"
,
"
../
../../flash-build/
build/flowplayer
-3.2.17-dev
.swf
"
,
{
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.sharing.Sharing
'
},
...
...
@@ -27,7 +27,7 @@ flowplayer("player", "../build/flowplayer.swf",
plugins
:
{
sharing
:
{
url
:
'
flowplayer.sharing.swf
'
,
url
:
'
flowplayer.sharing
-3.2.15-dev
.swf
'
,
twitter
:
{
description
:
'
twitter foobar
'
},
...
...
core/test/simple.html
View file @
319701d8
...
...
@@ -18,9 +18,9 @@
id=
"player"
>
</a>
<script>
flowplayer
(
"
player
"
,
"
../../../flash-build/build/flowplayer
.commercial
-3.2.17-dev.swf
"
,
flowplayer
(
"
player
"
,
"
../../../flash-build/build/flowplayer-3.2.17-dev.swf
"
,
{
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.
util.DomainUtil
'
},
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.
controls.scrubber.ScrubberSlider
'
},
key
:
'
#$b6223bfbd646c621758
'
,
...
...
@@ -80,10 +80,6 @@
autoBuffering
:
true
// ,
// duration: 20
},
plugins
:
{
content
:
{
url
:
'
flowplayer.rtmp.swf
'
}
}
...
...
core/test/text_data.html
0 → 100644
View file @
319701d8
<html><head>
<meta
http-equiv=
"content-type"
content=
"text/html; charset=UTF-8"
>
<!--<script src="../flowplayer-3.2.6.min.js"></script>-->
<!--<script src="../src/javascript/flashembed.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=
"fly.mov"
style=
"display:block;width:440px;height:247px"
id=
"player"
>
</a>
<script>
flowplayer
(
"
player
"
,
"
../../../flash-build/build/flowplayer-3.2.17-dev.swf
"
,
{
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.controller.NetStreamClient
'
},
key
:
'
#$b6223bfbd646c621758
'
,
onBegin
:
function
()
{
console
.
log
(
"
onBegin
"
);
},
onStart
:
function
()
{
console
.
log
(
"
onStart
"
);
},
onStartBuffering
:
function
()
{
console
.
log
(
"
onStartBuffering
"
);
},
onFinish
:
function
()
{
console
.
log
(
"
onFinish
"
);
},
onPause
:
function
()
{
console
.
log
(
"
onPause
"
);
},
onResume
:
function
()
{
console
.
log
(
"
onResume
"
);
},
onBeforeSeek
:
function
(
clip
,
target
)
{
console
.
log
(
"
onBeforeSeek, target pos
"
+
target
);
},
onSeek
:
function
(
clip
,
target
)
{
console
.
log
(
"
onSeek, target pos
"
+
target
);
},
onLastSecond
:
function
()
{
console
.
log
(
"
onLastSecond
"
);
},
clip
:
{
onNetStreamEvent
:
function
(
clip
,
type
,
info
)
{
if
(
type
==
"
onTextData
"
)
{
console
.
log
(
"
onTextData:
"
,
info
);
}
},
url
:
'
http://stream.flowplayer.org/big_buck_bunny_with_captions.mp4
'
,
captionsTrackFilter
:
"
trackid=2
"
,
scaling
:
'
fit
'
},
plugins
:
{
captions
:
{
url
:
"
flowplayer.captions-3.2.10-dev.swf
"
,
captionTarget
:
"
content
"
},
content
:
{
url
:
"
flowplayer.content-3.2.8.swf
"
,
bottom
:
26
,
height
:
30
,
backgroundColor
:
"
transparent
"
,
backgroundGradient
:
"
none
"
,
border
:
"
none
"
,
textDecoration
:
"
outline
"
,
style
:
{
body
:
{
textAlign
:
"
center
"
}
}
}
}
});
</script>
</div>
</body></html>
\ No newline at end of file
core/test/viral.html
View file @
319701d8
<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,12 +11,12 @@
<div
id=
"page"
>
<a
href=
"
../build
/flowplayer.flv"
href=
"
http://stream.flowplayer.org
/flowplayer
-700
.flv"
style=
"display:block;width:600px;height:350px"
id=
"player"
>
</a>
<script>
flowplayer
(
"
player
"
,
"
../build/flowplayer.swf
"
,
flowplayer
(
"
player
"
,
"
../
../../flash-build/
build/flowplayer.swf
"
,
{
log
:
{
level
:
'
debug
'
,
filter
:
'
org.flowplayer.viralvideos.EmailView, org.flowplayer.viralvideos.ViralVideos
'
},
onStart
:
function
()
{
...
...
@@ -40,7 +40,7 @@
// },
plugins
:
{
viral
:
{
url
:
'
flowplayer.viralvideos.swf
'
,
url
:
'
flowplayer.viralvideos
-3.2.14-dev
.swf
'
,
alpha
:
0.2
,
share
:
{
shareWindow
:
'
_self
'
,
...
...
@@ -73,6 +73,7 @@
},
dock
:
{
// bottom: 0
autoHide
:
false
}
}
...
...
js-plugins/bitrateselect/build.properties
View file @
319701d8
basename
=
flowplayer.bitrateselect
version
=
3.2.10
\ No newline at end of file
version
=
3.2.11-dev
\ No newline at end of file
js-plugins/controls/build.properties
View file @
319701d8
basename
=
flowplayer.controls
version
=
3.2.10
\ No newline at end of file
version
=
3.2.11-dev
\ No newline at end of file
js-plugins/embed/build.properties
View file @
319701d8
basename
=
flowplayer.embed
version
=
3.2.10
\ No newline at end of file
version
=
3.2.11-dev
\ No newline at end of file
js-plugins/ipad/build.properties
View file @
319701d8
basename
=
flowplayer.ipad
version
=
3.2.1
2
version
=
3.2.1
3-dev
js-plugins/playlist/build.properties
View file @
319701d8
basename
=
flowplayer.playlist
version
=
3.2.10
\ No newline at end of file
version
=
3.2.11-dev
\ No newline at end of file
plugins/audio/build.properties
View file @
319701d8
version
=
3.2.1
0
version
=
3.2.1
1-dev
devkit-dir
=
../../lib/devkit
\ No newline at end of file
plugins/bitrateselect/build.properties
View file @
319701d8
devkit-dir
=
../../lib/devkit
version
=
3.2.1
3
version
=
3.2.1
4-dev
plugins/content/build.properties
View file @
319701d8
devkit-dir
=
../../lib/devkit
version
=
3.2.
8
version
=
3.2.
9-dev
plugins/controls/build.properties
View file @
319701d8
version
=
3.2.15
version
=
3.2.15
-dev
devkit-dir
=
../../lib/devkit
plugins/menu/build.properties
View file @
319701d8
devkit-dir
=
../../lib/devkit
version
=
3.2.12
\ No newline at end of file
version
=
3.2.13-dev
\ No newline at end of file
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment