--- a/test/mashup/player-html.htm	Fri Sep 14 10:38:04 2012 +0900
+++ b/test/mashup/player-html.htm	Wed Sep 19 14:11:49 2012 +0900
@@ -72,61 +72,55 @@
 IriSP.widgetsDir = "../metadataplayer";
 IriSP.language = 'fr';
 var _metadata = {
-//    url: 'bab_files/mashup.json',
+    url: 'bab_files/mashup.json',
 //    url: 'http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/cljson/id/b2754186-a0c9-11e0-b8bd-00145ea49a02?callback=?',
 //    url: 'http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/cljson/id/5afd8bbe-9b75-11e1-9e5d-00145ea4a2be?callback=?',
 //	  url: 'http://localhost/pf/ldtplatform/ldt/mashupbytag/?tag=projection',
-    url: 'http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/mashupbytag/?tag=mashuptag&callback=?',
+//    url: 'http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/mashupbytag/?tag=mashuptag&callback=?',
 //    url: 'http://localhost/pf/ldtplatform/ldt/mashupbytag/?tag=mashuptag&in=240000&out=1860000',
     format: 'ldt'
 };
-var _canPlayMp4 = document.createElement('video').canPlayType('video/mp4');
 var _config = {
-    gui: {
-        width : 630,
-        container : 'LdtPlayer',
-        default_options: {
-            metadata: _metadata
+    width : 630,
+    container : 'LdtPlayer',
+    default_options: {
+        metadata: _metadata
+    },
+    css : '../metadataplayer/LdtPlayer-core.css',
+    widgets: [
+        {
+            type: "MashupPlayer",
+            url_transform: url_transform_func
+        },
+        { type: "Slider" },
+        { type: "Controller" },
+        {
+            type: "Segments",
+            annotation_type: false
         },
-        css : '../metadataplayer/LdtPlayer-core.css',
-        widgets: [
-            { type: "Slider" },
-            { type: "Controller" },
-            {
-                type: "Segments",
-                annotation_type: false
-            },
-            { type: "Arrow" },
-            {
-                type: "Annotation",
-                annotation_type: false
-            },
-            {
-                type: "Tagger",
-                api_endpoint: "../post-test.php",
-                tags: ["actif","amour","bonheur","captif","charité","désir","dieu","doute","famille","idéal","internationale","passif","patrie","peur","politique","président","spleen","travail"]
-            },
-            {
-                type: "MediaList",
-                container: "mediaList"
-            },
-            {
-                type: "AnnotationsList",
-                container: "annotationList",
-                //ajax_url: "http://ldt.iri.centrepompidou.fr/ldtplatform/api/ldt/segments/{{media}}/{{begin}}/{{end}}?callback=?",
-                //ajax_granularity: 30000,
-                //limit_count: 3
-            },
-            { type: "Mediafragment" }
-        ]
-    },
-    player:{
-        type:'mashup-html',
-        url_transform: url_transform_func,
-        height: 350,
-        width: 630,
-        metadata: _metadata
-    }
+        { type: "Arrow" },
+        {
+            type: "Annotation",
+            annotation_type: false
+        },
+        {
+            type: "Tagger",
+            api_endpoint: "../post-test.php",
+            tags: ["actif","amour","bonheur","captif","charité","désir","dieu","doute","famille","idéal","internationale","passif","patrie","peur","politique","président","spleen","travail"]
+        },
+        {
+            type: "MediaList",
+            container: "mediaList"
+        },
+        {
+            type: "AnnotationsList",
+            container: "annotationList",
+            //ajax_url: "http://ldt.iri.centrepompidou.fr/ldtplatform/api/ldt/segments/{{media}}/{{begin}}/{{end}}?callback=?",
+            //ajax_granularity: 30000,
+            //limit_count: 3
+        },
+        { type: "Mediafragment" }
+    ]
 };
 
 _myPlayer = new IriSP.Metadataplayer(_config);