Re-organized playback tech location in source.

rfmcneil · Aug 13, 2012 · 0edfae5 · 0edfae5
1 parent d71b085
commit 0edfae5
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 149 deletions.
diff --git a/build.sh b/build.sh
@@ -30,7 +30,11 @@ cat src/tracks.js >> dist/video.js
 # h5swf temporarily requires swfobject
 # cat flash/swfobject.js >> dist/video.js
 
+cat tech/html5/html5.js >> dist/video.js
+cat tech/flash/flash.js >> dist/video.js
+
 cat src/setup.js >> dist/video.js
+
 cat src/_end.js >> dist/video.js
 
 

diff --git a/dev.html.example b/dev.html.example
@@ -20,13 +20,17 @@
   <script src="src/controls.js"></script>
   <script src="src/events.js"></script>
   <script src="src/tracks.js"></script>
+
+  <script src="tech/html5/html5.js"></script>
+  <script src="tech/flash/flash.js"></script>
 
   <script src="src/setup.js"></script>
-  
+
   <script type="text/javascript" charset="utf-8">
     // Easy access to test Flash over HTML5. Add ?flash to URL
     if (window.location.href.indexOf("?flash") !== -1) {
-      _V_.options.techOrder = ["H5swf"]
+      _V_.options.techOrder = ["flash"];
+      _V_.options.flash.swf = "tech/flash/video-js.swf";
     }
   </script>
 

diff --git a/src/tech/flash.js → tech/flash/flash.js b/src/tech/flash.js → tech/flash/flash.js
diff --git a/flash/swfobject.js → tech/flash/swfobject.js b/flash/swfobject.js → tech/flash/swfobject.js
diff --git a/flash/video-js.swf → tech/flash/video-js.swf b/flash/video-js.swf → tech/flash/video-js.swf
diff --git a/tech/flowplayer.js → tech/flowplayer/flowplayer.js b/tech/flowplayer.js → tech/flowplayer/flowplayer.js
diff --git a/src/tech/html5.js → tech/html5/html5.js b/src/tech/html5.js → tech/html5/html5.js
diff --git a/src/tech/vimeo.js → tech/vimeo/vimeo.js b/src/tech/vimeo.js → tech/vimeo/vimeo.js
diff --git a/tech/youtube.js b/tech/youtube.js
diff --git a/tech/youtube.html → tech/youtube/youtube.html b/tech/youtube.html → tech/youtube/youtube.html
diff --git a/src/tech/youtube.js → tech/youtube/youtube.js b/src/tech/youtube.js → tech/youtube/youtube.js
diff --git a/test/test.html b/test/test.html
@@ -20,6 +20,11 @@
   <script src='../src/player.js'></script>
   <script src='../src/tech.js'></script>
   <script src='../src/tracks.js'></script>
+
+  <script src='../tech/html5/html5.js'></script>
+  <script src='../tech/flash/flash.js'></script>
+
+
   <script src='../src/setup.js'></script>
   <!-- END Video.js Source Files -->