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
0caf18cb
Commit
0caf18cb
authored
Sep 04, 2012
by
Anssi Piirainen
Browse files
Merge pull request #8 from flowplayer/danielr-brmenu
- #7 add start event filter for clips with bitrateitems as well as bitra...
parents
6b145d72
e40312f6
Changes
8
Show whitespace changes
Inline
Side-by-side
core/README.txt
View file @
0caf18cb
...
...
@@ -8,6 +8,7 @@ Version history:
- #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.
- #627 re-enable stagevideo state change listeners if stagevideo is available or detach the fullscreen events on first call.
- #9 when replaying from stopping, connection does not receive callbacks anymore.
3.2.12
------
...
...
core/src/actionscript/org/flowplayer/controller/NetStreamControllingStreamProvider.as
View file @
0caf18cb
...
...
@@ -862,7 +862,8 @@ package org.flowplayer.controller {
// clip.setContent(null);
}
else
{
silentSeek
=
true
;
netStream
.
client
=
new
NullNetStreamClient
()
;
//#9 when replaying from stopping, connection does not receive callbacks anymore.
//netStream.client = new NullNetStreamClient();
netStream
.
pause
()
;
netStream
.
seek
(
0
)
;
}
...
...
plugins/bitrateselect/README.txt
View file @
0caf18cb
...
...
@@ -4,6 +4,7 @@ Version history:
------
- #605 Fixes for autoHide configuration
- #623 Fixes for widget enabled state. Require to also update the main controls config correctly as the controlbar config gets reset on updates.
- #7 add start event filter for clips with bitrateitems as well as bitrateselect resolver checks.
3.2.11
------
...
...
plugins/bitrateselect/src/actionscript/org/flowplayer/bitrateselect/BitrateSelectProvider.as
View file @
0caf18cb
...
...
@@ -146,10 +146,11 @@ package org.flowplayer.bitrateselect {
//#488 regression with #r1764 filter onStart events to only work with bitrateselect configured clips. Problem when autobuffering with playlst splash images.
//#7 filter for clips with bitrateitems also.
private
function
applyForClip
(
clip
:
Clip
)
:
Boolean
{
log
.
debug
(
"applyForClip(), clip.urlResolvers == "
+
clip
.
urlResolvers
)
;
if
(
clip
.
urlResolvers
==
null
)
return
false
;
var
apply
:
Boolean
=
clip
.
urlResolvers
.
indexOf
(
_model
.
name
)
>=
0
;
var
apply
:
Boolean
=
clip
.
urlResolvers
.
indexOf
(
_model
.
name
)
>=
0
&&
clip
.
getCustomProperty
(
"bitrateItems"
)
;
log
.
debug
(
"applyForClip? "
+
apply
)
;
return
apply
;
}
...
...
plugins/bwcheck/README.txt
View file @
0caf18cb
...
...
@@ -4,6 +4,7 @@ Version history:
------
- #547 Live dynamic stream switching not working on Internap CDN
- #563 fixes for resolving bitrates with the bitrateselect and menu plugin.
- #6 cache control headers don't work on chrome windows, just use the cache busting url param.
3.2.9
-----
...
...
plugins/bwcheck/src/actionscript/org/flowplayer/bwcheck/detect/BandwidthDetectorHttp.as
View file @
0caf18cb
...
...
@@ -104,9 +104,7 @@ package org.flowplayer.bwcheck.detect {
loader
.
addEventListener
(
IOErrorEvent
.
IO_ERROR
,
onError
)
;
var
request
:
URLRequest
=
new
URLRequest
(
_referenceFileUrl
+
"?"
+
Math
.
random
())
;
_nocache
=
new
URLRequestHeader
(
"Cache-Control"
,
"no-store, no-cache, must-revalidate"
)
;
var
headers
:
Array
=
new
Array
(
_nocache
)
;
request
.
requestHeaders
=
headers
;
//#6 cache control headers don't work on chrome windows, just use the cache busting url param.
request
.
method
=
URLRequestMethod
.
GET
;
loader
.
load
(
request
)
;
...
...
@@ -116,6 +114,7 @@ package org.flowplayer.bwcheck.detect {
}
protected
function
onError
(
event
:
IOErrorEvent
)
:
void
{
log
.
error
()
;
var
obj
:
Object
=
new
Object
()
;
obj
.
application
=
""
;
obj
.
description
=
event
.
text
;
...
...
plugins/menu/README.txt
View file @
0caf18cb
...
...
@@ -3,6 +3,7 @@ Version history:
3.2.10
------
- new build because of changes in common libraries this plugin uses
- #7 check for stage availability before positioning the dock or position once stage is available when resetting menu items.
3.2.9
-----
...
...
plugins/menu/src/actionscript/org/flowplayer/menu/ui/Menu.as
View file @
0caf18cb
...
...
@@ -234,9 +234,8 @@ package org.flowplayer.menu.ui {
adjustDockPosition
()
;
}
else
{
// the position will be adjuster every time the menu becomes visible
this
.
addEventListener
(
Event
.
ADDED_TO_STAGE
,
function
(
event
:
Event
):
void
{
adjustDockPosition
()
;
})
;
//#7 adjust the dock once the stage is available
this
.
addEventListener
(
Event
.
ADDED_TO_STAGE
,
adjustDockOnStage
)
;
}
}
...
...
@@ -251,13 +250,31 @@ package org.flowplayer.menu.ui {
}
if
(
!
verticalPosConfigured
)
{
log
.
debug
(
"stage == "
+
stage
)
;
if
(
stage
)
{
myModel
.
bottom
=
stage
.
stageHeight
-
DisplayObject
(
_menuButtonContainer
).
y
;
}
else
{
//#7 adjust the dock once the stage is available
this
.
addEventListener
(
Event
.
ADDED_TO_STAGE
,
adjustDockOnStage
)
;
return
;
}
log
.
debug
(
"adjustDockPosition(), menuButtonContainer.y = "
+
_menuButtonContainer
[
"y"
])
;
log
.
debug
(
"adjustDockPosition(), vertical menu position adjusted to "
+
myModel
.
position
)
;
}
_player
.
animationEngine
.
animate
(
this
,
myModel
,
0
)
;
}
/**
* #7 adjust the dock once the stage is available once only.
* @param event
*/
private
function
adjustDockOnStage
(
event
:
Event
)
:
void
{
adjustDockPosition
()
;
this
.
removeEventListener
(
Event
.
ADDED_TO_STAGE
,
adjustDockOnStage
)
;
}
private
function
createDock
()
:
void
{
log
.
debug
(
"createDock()"
)
;
var
dockConfig
:
DockConfig
=
new
DockConfig
()
;
...
...
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