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