| 1 |
--- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as.orig 2012-11-14 15:48:22.000000000 +0100 |
| 2 |
+++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButtonOverlay.as 2012-11-20 15:14:02.000000000 +0100 |
| 3 |
@@ -98,6 +98,11 @@ |
| 4 |
override protected function onMouseClick(event:MouseEvent):void |
| 5 |
{ |
| 6 |
var playable:PlayTrait = media.getTrait(MediaTraitType.PLAY) as PlayTrait; |
| 7 |
+ var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait; |
| 8 |
+ if(playable.playState == PlayState.STOPPED) |
| 9 |
+ { |
| 10 |
+ try{seekable.seek(0);}catch(e:Object){} |
| 11 |
+ } |
| 12 |
playable.play(); |
| 13 |
} |
| 14 |
|
| 15 |
@@ -134,4 +139,4 @@ |
| 16 |
/* static */ |
| 17 |
private static const VISIBILITY_DELAY:int = 500; |
| 18 |
} |
| 19 |
-} |
| 20 |
\ No newline at end of file |
| 21 |
+} |
| 22 |
--- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as.orig 2012-11-14 15:48:22.000000000 +0100 |
| 23 |
+++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/Slider.as 2012-11-14 15:42:53.000000000 +0100 |
| 24 |
@@ -106,7 +106,7 @@ |
| 25 |
if (_enabled && _sliding == false) |
| 26 |
{ |
| 27 |
_sliding = true; |
| 28 |
- stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag); |
| 29 |
+ stage.addEventListener(MouseEvent.MOUSE_UP, onStageExitDrag, true); |
| 30 |
updateFace(down); |
| 31 |
scrubTimer.start(); |
| 32 |
dispatchEvent(new ScrubberEvent(ScrubberEvent.SCRUB_START)); |
| 33 |
--- ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as.orig 2012-11-14 15:48:22.000000000 +0100 |
| 34 |
+++ ./player/StrobeMediaPlayback/src/org/osmf/player/chrome/widgets/PlayButton.as 2012-11-14 15:42:53.000000000 +0100 |
| 35 |
@@ -26,6 +26,7 @@ |
| 36 |
import org.osmf.traits.MediaTraitType; |
| 37 |
import org.osmf.traits.PlayState; |
| 38 |
import org.osmf.traits.PlayTrait; |
| 39 |
+ import org.osmf.traits.SeekTrait; |
| 40 |
|
| 41 |
public class PlayButton extends PlayableButton |
| 42 |
{ |
| 43 |
@@ -44,6 +45,11 @@ |
| 44 |
override protected function onMouseClick(event:MouseEvent):void |
| 45 |
{ |
| 46 |
var playable:PlayTrait = media.getTrait(MediaTraitType.PLAY) as PlayTrait; |
| 47 |
+ var seekable:SeekTrait = media.getTrait(MediaTraitType.SEEK) as SeekTrait; |
| 48 |
+ if(playable.playState == PlayState.STOPPED) |
| 49 |
+ { |
| 50 |
+ try{seekable.seek(0);}catch(e:Object){} |
| 51 |
+ } |
| 52 |
playable.play(); |
| 53 |
event.stopImmediatePropagation(); |
| 54 |
} |
| 55 |
@@ -58,4 +64,4 @@ |
| 56 |
} |
| 57 |
} |
| 58 |
} |
| 59 |
-} |
| 60 |
\ No newline at end of file |
| 61 |
+} |
| 62 |
--- ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as.orig 2012-11-14 15:48:22.000000000 +0100 |
| 63 |
+++ ./player/StrobeMediaPlayback/src/StrobeMediaPlayback.as 2012-11-14 15:42:54.000000000 +0100 |
| 64 |
@@ -52,6 +52,7 @@ |
| 65 |
import org.osmf.traits.MediaTraitType; |
| 66 |
import org.osmf.traits.PlayState; |
| 67 |
import org.osmf.traits.PlayTrait; |
| 68 |
+ import org.osmf.traits.SeekTrait; |
| 69 |
import org.osmf.utils.OSMFSettings; |
| 70 |
import org.osmf.utils.OSMFStrings; |
| 71 |
|
| 72 |
@@ -152,6 +153,7 @@ |
| 73 |
|
| 74 |
player.addEventListener(TimeEvent.COMPLETE, onComplete); |
| 75 |
player.addEventListener(MediaErrorEvent.MEDIA_ERROR, onMediaError); |
| 76 |
+ player.addEventListener(MediaPlayerCapabilityChangeEvent.CAN_PLAY_CHANGE, onCanPlayChange); |
| 77 |
|
| 78 |
// Add DRM error handler |
| 79 |
var drmManager:DRMManager = DRMManager.getDRMManager(); |
| 80 |
@@ -338,6 +340,8 @@ |
| 81 |
mainContainer.backgroundAlpha = 0; |
| 82 |
mainContainer.addEventListener(MouseEvent.DOUBLE_CLICK, onFullScreenRequest); |
| 83 |
mainContainer.addEventListener(MouseEvent.CLICK, onMainClick, false); |
| 84 |
+ mainContainer.addEventListener(MouseEvent.MOUSE_DOWN, onMainDown, false); |
| 85 |
+ mainContainer.addEventListener(MouseEvent.MOUSE_UP, onMainUp, false); |
| 86 |
mainContainer.doubleClickEnabled = true; |
| 87 |
|
| 88 |
addChild(mainContainer); |
| 89 |
@@ -415,6 +419,9 @@ |
| 90 |
} |
| 91 |
|
| 92 |
player.addEventListener(PlayEvent.PLAY_STATE_CHANGE, onSetAutoHide); |
| 93 |
+ |
| 94 |
+ controlBarContainer.addEventListener(MouseEvent.MOUSE_DOWN, onControlBarAny, false); |
| 95 |
+ controlBarContainer.addEventListener(MouseEvent.MOUSE_UP, onControlBarAny, false); |
| 96 |
|
| 97 |
layout(); |
| 98 |
|
| 99 |
@@ -757,6 +764,38 @@ |
| 100 |
} |
| 101 |
} |
| 102 |
|
| 103 |
+ private function onMainDown(event:MouseEvent):void |
| 104 |
+ { |
| 105 |
+ var playable:PlayTrait = player.media.getTrait(MediaTraitType.PLAY) as PlayTrait; |
| 106 |
+ if (playable.playState == PlayState.PLAYING) |
| 107 |
+ { |
| 108 |
+ playable.pause(); |
| 109 |
+ } |
| 110 |
+ } |
| 111 |
+ |
| 112 |
+ private function onMainUp(event:MouseEvent):void |
| 113 |
+ { |
| 114 |
+ var playable:PlayTrait = player.media.getTrait(MediaTraitType.PLAY) as PlayTrait; |
| 115 |
+ var seekable:SeekTrait = player.media.getTrait(MediaTraitType.SEEK) as SeekTrait; |
| 116 |
+ if(playable.playState == PlayState.STOPPED) |
| 117 |
+ { |
| 118 |
+ if(player.canSeek){seekable.seek(0);} |
| 119 |
+ playable.play(); |
| 120 |
+ } |
| 121 |
+ else if(playable.playState == PlayState.PAUSED) |
| 122 |
+ { |
| 123 |
+ playable.play(); |
| 124 |
+ } |
| 125 |
+ } |
| 126 |
+ |
| 127 |
+ private function onControlBarAny(event:MouseEvent):void |
| 128 |
+ { |
| 129 |
+ if(event.eventPhase == EventPhase.BUBBLING_PHASE) |
| 130 |
+ { |
| 131 |
+ event.stopImmediatePropagation(); |
| 132 |
+ } |
| 133 |
+ } |
| 134 |
+ |
| 135 |
/** |
| 136 |
* Toggles full screen state. |
| 137 |
*/ |
| 138 |
@@ -1036,12 +1075,20 @@ |
| 139 |
&& configuration.endOfVideoOverlay != "" |
| 140 |
&& player.loop == false |
| 141 |
&& player.playing == false |
| 142 |
+ && player.autoRewind == true |
| 143 |
) |
| 144 |
{ |
| 145 |
processPoster(configuration.endOfVideoOverlay); |
| 146 |
} |
| 147 |
} |
| 148 |
|
| 149 |
+ private function onCanPlayChange(event:MediaPlayerCapabilityChangeEvent):void |
| 150 |
+ { |
| 151 |
+ // Make sure this event gets handled only once: |
| 152 |
+ player.removeEventListener(event.type, arguments.callee); |
| 153 |
+ player.play(); player.stop(); |
| 154 |
+ } |
| 155 |
+ |
| 156 |
private function onMediaError(event:MediaErrorEvent):void |
| 157 |
{ |
| 158 |
// Make sure this event gets handled only once: |