vumix/commit

fix duplicate location for videoplayer

diff --git a/applications/vumix.pl b/applications/vumix.pl
index 9274f68..1e97161 100644
--- a/applications/vumix.pl
+++ b/applications/vumix.pl
@@ -153,12 +153,12 @@ yui_script(Target, Fields) -->
 	      \js_video_frames(Target),
 	      \js_title_edit(Target),
 	      \js_annotation_fields(Fields, Target),
-	      'videoFrames.on("frameSelect", function(e) {console.log(e);videoPlayer.setTime(e.time, true)});']).
+	      'videoFrames.on("frameSelect", function(e) {videoPlayer.setTime(e.time, true)});']).
 
 js_module('videoplayer', json([fullpath(Path),
 			       requires([node,event,widget])
 			      ])) :-
-	http_absolute_location(js('videoplayer/videoplayer.js'), Path, []).
+	http_absolute_location(js('vuplayer/videoplayer.js'), Path, []).
 js_module('videoframes', json([fullpath(Path),
 			       requires([node,event,widget])
 			      ])) :-
@@ -211,7 +211,7 @@ js_title_edit(Target) -->
 		  }).
 
 js_video(Target) -->
-	{ http_absolute_location(js('videoplayer/'), FilePath, []),
+	{ http_absolute_location(js('vuplayer/'), FilePath, []),
 	  video_source(Target, Src)
 	},
 	yui3_new(videoPlayer,
diff --git a/web/js/videoplayer/player.swf b/web/js/vuplayer/player.swf
similarity index 100%
rename from web/js/videoplayer/player.swf
rename to web/js/vuplayer/player.swf
diff --git a/web/js/videoplayer/silverlight.js b/web/js/vuplayer/silverlight.js
similarity index 100%
rename from web/js/videoplayer/silverlight.js
rename to web/js/vuplayer/silverlight.js
diff --git a/web/js/videoplayer/swfobject.js b/web/js/vuplayer/swfobject.js
similarity index 100%
rename from web/js/videoplayer/swfobject.js
rename to web/js/vuplayer/swfobject.js
diff --git a/web/js/videoplayer/ugslplayer.js b/web/js/vuplayer/ugslplayer.js
similarity index 100%
rename from web/js/videoplayer/ugslplayer.js
rename to web/js/vuplayer/ugslplayer.js
diff --git a/web/js/videoplayer/videoplayer.js b/web/js/vuplayer/videoplayer.js
similarity index 100%
rename from web/js/videoplayer/videoplayer.js
rename to web/js/vuplayer/videoplayer.js
diff --git a/web/js/videoplayer/wmvplayer.js b/web/js/vuplayer/wmvplayer.js
similarity index 100%
rename from web/js/videoplayer/wmvplayer.js
rename to web/js/vuplayer/wmvplayer.js
diff --git a/web/js/videoplayer/wmvplayer.xaml b/web/js/vuplayer/wmvplayer.xaml
similarity index 100%
rename from web/js/videoplayer/wmvplayer.xaml
rename to web/js/vuplayer/wmvplayer.xaml