# HG changeset patch
# User veltr
# Date 1339000536 -7200
# Node ID 446e7f0c49691fd5c56aee97da54a27a1e25a188
# Parent  692a26b5274b02f8cb82f79d33f6e17f76ad7655# Parent  fa256a9f8d05ca655c2bdb2304781aa8983514f0
Merge with fa256a9f8d05ca655c2bdb2304781aa8983514f0

diff -r fa256a9f8d05 -r 446e7f0c4969 crea/integration/libs/player.swf
Binary file crea/integration/libs/player.swf has changed
diff -r fa256a9f8d05 -r 446e7f0c4969 crea/integration/metadataplayer/LdtPlayer-core.js
--- a/crea/integration/metadataplayer/LdtPlayer-core.js	Wed Jun 06 18:32:50 2012 +0200
+++ b/crea/integration/metadataplayer/LdtPlayer-core.js	Wed Jun 06 18:35:36 2012 +0200
@@ -29,7 +29,7 @@
 
 /* The Metadataplayer Object, single point of entry, replaces IriSP.init_player */
 
-IriSP.Metadataplayer = function(config, video_metadata) {
+IriSP.Metadataplayer = function(config) {
     IriSP.log("IriSP.Metadataplayer constructor");
     for (var key in IriSP.guiDefaults) {
         if (IriSP.guiDefaults.hasOwnProperty(key) && !config.gui.hasOwnProperty(key)) {
@@ -38,7 +38,6 @@
     }
     var _container = document.getElementById(config.gui.container);
     _container.innerHTML = '<h3 class="Ldt-Loader">Loading... Chargement...</h3>';
-    this.video_metadata = video_metadata;
     this.sourceManager = new IriSP.Model.Directory();
     this.config = config;
     this.callbackQueue = [];
@@ -116,7 +115,7 @@
     IriSP.loadCss(IriSP.getLib("cssjQueryUI"));
     IriSP.loadCss(this.config.gui.css);
     
-    this.videoData = this.loadMetadata(this.video_metadata);
+    this.videoData = this.loadMetadata(this.config.player.metadata);
     this.$ = IriSP.jQuery('#' + this.config.gui.container);
     this.$.css({
         "width": this.config.gui.width,
@@ -240,7 +239,7 @@
             IriSP.jQuery("#" + containerDiv).append(_videoEl);
             pop = Popcorn("#" + _tmpId);
             break;
-            
+
         case "html5-audio":
             var _tmpId = Popcorn.guid("audio"),
                 _videoEl = IriSP.jQuery('<audio>');
@@ -268,7 +267,7 @@
             delete opts.video;
 
             if(!opts.hasOwnProperty("flashplayer")) {
-                opts.flashplayer = IriSP.jwplayer_swf_path;
+                opts.flashplayer = IriSP.getLib("jwPlayerSWF");
             }
 
             if(!opts.hasOwnProperty("controlbar.position")) {
@@ -1478,7 +1477,8 @@
         popcorn : "popcorn-complete.min.js",
         jwplayer : "jwplayer.js",
         raphael : "raphael-min.js",
-        tracemanager : "tracemanager.js"
+        tracemanager : "tracemanager.js",
+        jwPlayerSWF : "player.swf"
     },
     locations : {
         // use to define locations outside defautl_dir
diff -r fa256a9f8d05 -r 446e7f0c4969 crea/integration/metadataplayer/MusitagAnnotator.css
--- a/crea/integration/metadataplayer/MusitagAnnotator.css	Wed Jun 06 18:32:50 2012 +0200
+++ b/crea/integration/metadataplayer/MusitagAnnotator.css	Wed Jun 06 18:35:36 2012 +0200
@@ -8,7 +8,7 @@
 }
 
 .Musitag-Annotator-section {
-    float: left; width: 197px;
+    float: left;
 }
 
 .Musitag-Annotator-separator {
@@ -20,20 +20,21 @@
 }
 
 .Musitag-Annotator-section h3 {
-    font-size: 24px; text-align: center; margin: 0 10px;
+    font-size: 24px; text-align: center; margin: 0 10px; width: 160px;
 }
 
 .Musitag-Annotator-selector {
-    margin: 12px 8px;
+    width: 168px; margin: 12px 5px;
 }
 
 .Musitag-Annotator-tagInSelector {
-    float: left; margin: 5px;
+    float: left; margin: 2px;
 }
 
 .Musitag-Annotator-record {
-    width: 220px; height: 160px; background: url(../img/record.png) rgba(0,0,128,.5) center no-repeat;
-    margin: 25px -12px; cursor: pointer;
+    width: 220px; height: 160px;
+    margin: 25px 0;
+    z-index: 20;
 }
 
 .Musitag-Annotator-Note {
diff -r fa256a9f8d05 -r 446e7f0c4969 crea/integration/metadataplayer/MusitagAnnotator.js
--- a/crea/integration/metadataplayer/MusitagAnnotator.js	Wed Jun 06 18:32:50 2012 +0200
+++ b/crea/integration/metadataplayer/MusitagAnnotator.js	Wed Jun 06 18:35:36 2012 +0200
@@ -68,7 +68,33 @@
     + '<div class="Musitag-Annotator-section">'
     + '    <h2>3</h2>'
     + '    <h3>Enregistre<br />ta voix</h3>'
-    + '    <div class="Musitag-Annotator-record"></div>'
+    + '    <div class="Musitag-Annotator-record">'
+    
+    + '<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="220" height="140" id="record_mic" align="middle">'
+    + '        <param name="movie" value="../../script/record_mic/record_mic.swf" />'
+    + '        <param name="quality" value="high" />'
+    + '        <param name="bgcolor" value="#ffffff" />'
+    + '        <param name="play" value="true" />'
+    + '        <param name="loop" value="true" />'
+    + '        <param name="wmode" value="transparent" />'
+    + '        <param name="scale" value="showall" />'
+    + '        <param name="menu" value="true" />'
+    + '        <param name="devicefont" value="false" />'
+    + '        <param name="salign" value="" />'
+    + '        <param name="allowScriptAccess" value="always" />'
+    + '        <param name="allowFullScreen" value="true" />'
+    + '        <param name="flashvars" value="playVisible=true">'
+    + '        <embed src="../../script/record_mic/record_mic.swf" quality="high" bgcolor="#ffffff"'
+    + '             width="220" height="140" name="ExternalInterfaceExample" align="middle"'
+    + '             play="true" loop="false" quality="high" allowScriptAccess="always" '
+    + '             type="application/x-shockwave-flash" allowFullScreen="true" wmode="transparent" '
+    + '             flashvars="playVisible=true"'
+    + '             pluginspage="http://www.macromedia.com/go/getflashplayer">'
+    + '        </embed>'
+    + '    </object>'
+    
+    
+    +'</div>'
     + '</div>'
     + '<div class="Musitag-Annotator-separator"></div>'
     + '<div class="Musitag-Annotator-section">'
diff -r fa256a9f8d05 -r 446e7f0c4969 crea/integration/player.html
--- a/crea/integration/player.html	Wed Jun 06 18:32:50 2012 +0200
+++ b/crea/integration/player.html	Wed Jun 06 18:35:36 2012 +0200
@@ -36,7 +36,6 @@
             
         </div>
     <script type="text/javascript">
-    IriSP.jwplayer_swf_path = "player.swf";
     IriSP.libFiles.defaultDir = "libs/";
     IriSP.widgetsDir = "metadataplayer";
     var _metadata = {
@@ -79,10 +78,11 @@
         player:{
             type: 'jwplayer',
             height: 1, 
-            width: 1
+            width: 1,
+            metadata: _metadata
         }
     };
-    var _myPlayer = new IriSP.Metadataplayer(_config, _metadata);
+    var _myPlayer = new IriSP.Metadataplayer(_config);
     </script>
     </body>
 </html>
diff -r fa256a9f8d05 -r 446e7f0c4969 crea/integration/player.swf
Binary file crea/integration/player.swf has changed