# HG changeset patch
# User Edwin Razafimahatratra <edwin@robotalismsoft.com>
# Date 1355324097 -3600
# Node ID d92196482ad9b9c4f5266bcfbab5cf463c330a0a
# Parent  dbd46ed42b0d9642f4c81fe6c7e3e3a44ff2e9de
tweaks

diff -r dbd46ed42b0d -r d92196482ad9 web/static/res/js/incchoice.js
--- a/web/static/res/js/incchoice.js	Wed Dec 12 04:01:13 2012 +0100
+++ b/web/static/res/js/incchoice.js	Wed Dec 12 15:54:57 2012 +0100
@@ -68,20 +68,27 @@
 
 		this.canSelectWord = false;
 
-		// Start the mosaic effect
-		incMosaic.UnpauseEffect(true);
-
-		// Fade the text
-		$('.big_txt').animate({opacity: 0}, 20000 * 1 / effectSpeed);
-
 		// Save the word
 		this.setCookie("niv1_world" + this.currentWorldIndex, $("#mot" + wordIndex).html());
+
+		++this.currentWorldIndex;
+
+		if (this.currentWorldIndex == 3) {
+			// The 3 words get choosen
+			location.href = "niv1_videoplayer.html";
+		} else {
+			
+			// Start the mosaic effect
+			incMosaic.UnpauseEffect(true);
+
+			// Fade the text
+			$('.big_txt').animate({opacity: 0}, 20000 * 1 / effectSpeed);
+		}
 	};
 
 	this.effectIsDone = function()
 	{
 		this.canSelectWord = true;
-		++this.currentWorldIndex;
 
         // Set the list of words and the mosaic effect
 		this.setWordsAndEffect(this.currentWorldIndex);
@@ -91,11 +98,6 @@
 
 		// Fade the text
 		$('.big_txt').animate({opacity: 1}, 10000 * 1 / effectSpeed);
-
-		if (this.currentWorldIndex == 3) {
-			// The 3 words get choosen
-			location.href = "niv1_videoplayer.html";
-		}
 	};
 
 	this.getChoosenWords = function()
diff -r dbd46ed42b0d -r d92196482ad9 web/static/res/js/incplayer.js
--- a/web/static/res/js/incplayer.js	Wed Dec 12 04:01:13 2012 +0100
+++ b/web/static/res/js/incplayer.js	Wed Dec 12 15:54:57 2012 +0100
@@ -96,31 +96,51 @@
 	{
 		this.sequences = [];
 		var videos = this.allSequencesData.videos;
-		this.sequences.push(this.getRandomVideos(words[0]));		
-		this.sequences.push(this.getRandomVideos(words[1]));		
-		this.sequences.push(this.getRandomVideos(words[2]));		
+
+		// Choose first video
+		var v1 = this.getRandomVideos(words[0]);
+		this.sequences.push(v1);		
+
+		var v2, v3;
+
+		// Choose second video
+		do {
+			v2 = this.getRandomVideos(words[1])	;
+		} while (v2.src == v1.src);
+		this.sequences.push(v2);		
+
+		// Choose third video
+		do {
+			v3 = this.getRandomVideos(words[2])	;
+		} while (v3.src == v1.src || v3.src == v2.src);
+		this.sequences.push(v3);		
 
 		// Set the video file name 
 		var i;
 		for (i = 0; i < this.sequences.length; ++i) {
-			var file = this.sequences[i];
+			var v = this.sequences[i];
 			
 			// HD
 			if(this.hd) {
-				file += "hd"; 
+				v.src += "hd"; 
 			}
 
 			// Extention
-			file += "." + /*this.videoExt*/ "mp4"; // todo
+			v.src += "." + /*this.videoExt*/ "mp4"; // todo
 
 			// Set the final file
-			this.sequences[i] = file;
+			this.sequences[i] = v;
 		}
 
 		for (i = 0; i < this.sequences.length; ++i) {
-			this.sequences[i] = { src: this.sequences[i], in: 0, out: -1 };
+			var seq = this.sequences[i];
+
+			var integer = Math.floor(seq.duration);
+			var decimal = Math.floor((seq.duration - integer) * 100);
+			var duration = integer * 60 + decimal;
+
+			this.sequences[i] = { src: seq.src, in: 0, out: duration };
 		}
-
 		
 		this.logi("choosed sequences:");
 		for (i = 0; i < this.sequences.length; ++i) {
@@ -139,7 +159,7 @@
 
 			// We push has many time the url that the score for the word
 			for (var j = 0; j < video.scoreWord[index]; ++j) {
-				videos.push(video.src);
+				videos.push(video);
 			}
 		}
 
@@ -184,7 +204,16 @@
 
 			self.listenEvent(pop, "timeupdate", false, function() {
 				// Update the current time position
-				$(self.progressCurrent).html(self.secondsToTime(self.popSeq.currentTime()));
+				var currentTime = self.popSeq.currentTime();
+				$(self.progressCurrent).html(self.secondsToTime(currentTime));
+
+				// Detect vsquence end
+				if (self.popSeq.active == 2 && currentTime >= self.popSeq.duration()) {
+					setTimeout(function() { 
+								location.href = "transition.html";
+							}, 2000);
+
+				}
 			});
 
 			self.listenEvent(pop, "canplaythrough", true, function() {
@@ -197,7 +226,7 @@
 
 			// todo
 			// Set total duration
-			//$(self.progressDuration).html(self.secondsToTime(self.popSeq.duration()));			
+			$(self.progressDuration).html(self.secondsToTime(self.popSeq.duration()));			
 
 			if (!self.iOS) {
 				// Automatic play
@@ -213,8 +242,6 @@
 		});
 
 		self.popSeq.on("ended", function() {
-			// todo
-			location.href = "transition.html";			
 		});
 
 	};
diff -r dbd46ed42b0d -r d92196482ad9 web/static/res/json/sequences.json
--- a/web/static/res/json/sequences.json	Wed Dec 12 04:01:13 2012 +0100
+++ b/web/static/res/json/sequences.json	Wed Dec 12 15:54:57 2012 +0100
@@ -7,307 +7,362 @@
         {
             "name": "kristina1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/kristina-HD-01",
-            "scoreWord": [0, 0, 0, 0, 0, 0, 7, 0, 8, 0, 0, 0, 4, 0, 8, 0, 0, 0]
+            "scoreWord": [0, 0, 0, 0, 0, 0, 7, 0, 8, 0, 0, 0, 4, 0, 8, 0, 0, 0],
+            "duration": 1.44
         },
         {
             "name": "kristina2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/kristina-HD-02",
-            "scoreWord": [0, 0, 0, 0, 8, 5, 3, 3, 8, 0, 0, 2, 10, 1, 8, 1, 0, 0]
+            "scoreWord": [0, 0, 0, 0, 8, 5, 3, 3, 8, 0, 0, 2, 10, 1, 8, 1, 0, 0],
+            "duration": 4.24
         },
         {
             "name": "kristina3",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/kristina-HD-03",
-            "scoreWord": [0, 0, 10, 0, 0, 0, 7, 0, 8, 0, 0, 6, 10, 1, 0, 0, 3, 0]
+            "scoreWord": [0, 0, 10, 0, 0, 0, 7, 0, 8, 0, 0, 6, 10, 1, 0, 0, 3, 0],
+            "duration": 1.14
         },
         {
             "name": "virginie1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/virginie-HD-01",
-            "scoreWord": [1, 10, 10, 0, 9, 10, 2, 0, 0, 0, 0, 8, 0, 0, 1, 10, 1, 1]
+            "scoreWord": [1, 10, 10, 0, 9, 10, 2, 0, 0, 0, 0, 8, 0, 0, 1, 10, 1, 1],
+            "duration": 3.31
         },
         {
             "name": "jp1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/JP-HD-01",
-            "scoreWord": [10, 0, 5, 0, 0, 0, 10, 0, 5, 0, 0, 0, 0, 0, 10, 0, 0, 5]
+            "scoreWord": [10, 0, 5, 0, 0, 0, 10, 0, 5, 0, 0, 0, 0, 0, 10, 0, 0, 5],
+            "duration": 2.20
         },
         {
             "name": "jp2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/JP-HD-01",
-            "scoreWord": [10, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 7, 0, 10, 8, 0, 0, 5]
+            "scoreWord": [10, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 7, 0, 10, 8, 0, 0, 5],
+            "duration": 1.40
         },
         {
             "name": "didier1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/didier-HD-01",
-            "scoreWord": [3, 0, 10, 0, 0, 0, 8, 5, 5, 7, 4, 6, 5, 5, 8, 0, 0, 0]
+            "scoreWord": [3, 0, 10, 0, 0, 0, 8, 5, 5, 7, 4, 6, 5, 5, 8, 0, 0, 0],
+            "duration": 5.55
         },
-        {
-            "name": "denis1",
-            "src": "http://dvvsyrlsr21oz.cloudfront.net/05-Jeambar-HD",
-            "scoreWord": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
-        },
-        {
+        {  
             "name": "david1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/david-HD-01",
-            "scoreWord": [0, 0, 8, 0, 8, 0, 9, 0, 0, 10, 0, 0, 0, 6, 1, 0, 2, 0]
+            "scoreWord": [0, 0, 8, 0, 8, 0, 9, 0, 0, 10, 0, 0, 0, 6, 1, 0, 2, 0],
+            "duration": 3.10
         },
         {
             "name": "david2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/david-HD-02",
-            "scoreWord": [2, 0, 10, 0, 0, 7, 9, 0, 0, 10, 0, 10, 0, 7, 0, 0, 2, 0]
+            "scoreWord": [2, 0, 10, 0, 0, 7, 9, 0, 0, 10, 0, 10, 0, 7, 0, 0, 2, 0],
+            "duration": 3.10
         },
         {
             "name": "dominique1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Dominique-HD-01",
-            "scoreWord": [7, 5, 5, 0, 10, 0, 10, 0, 4, 10, 0, 5, 0, 8, 7, 0, 0, 0]
+            "scoreWord": [7, 5, 5, 0, 10, 0, 10, 0, 4, 10, 0, 5, 0, 8, 7, 0, 0, 0],
+            "duration": 3.16
         },
         {
             "name": "margot1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Margot-HD-01",
-            "scoreWord": [0, 0, 10, 0, 8, 8, 10, 0, 0, 10, 7, 10, 5, 8, 0, 7, 0, 4]
+            "scoreWord": [0, 0, 10, 0, 8, 8, 10, 0, 0, 10, 7, 10, 5, 8, 0, 7, 0, 4],
+            "duration": 1.58
         },
         {
             "name": "philippe1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Philippe-HD-01",
-            "scoreWord": [0, 0, 8, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0]
+            "scoreWord": [0, 0, 8, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0],
+            "duration": 2.46
         },
         {
             "name": "philippe2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Philippe-HD-02",
-            "scoreWord": [0, 0, 10, 0, 0, 8, 10, 0, 7, 0, 10, 10, 0, 5, 0, 8, 0, 0]
+            "scoreWord": [0, 0, 10, 0, 0, 8, 10, 0, 7, 0, 10, 10, 0, 5, 0, 8, 0, 0],
+            "duration": 8.00
         },
         {
             "name": "philippe3",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Philippe-HD-03",
-            "scoreWord": [0, 0, 8, 0, 0, 8, 10, 0, 3, 3, 6, 6, 0, 6, 0, 0, 0, 0]
+            "scoreWord": [0, 0, 8, 0, 0, 8, 10, 0, 3, 3, 6, 6, 0, 6, 0, 0, 0, 0],
+            "duration": 2.30
         },
         {
             "name": "corenfeld1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Corenfeld-HD-01",
-            "scoreWord": [0, 0, 10, 0, 0, 0, 10, 10, 0, 0, 0, 0, 10, 9, 2, 0, 5, 5]
+            "scoreWord": [0, 0, 10, 0, 0, 0, 10, 10, 0, 0, 0, 0, 10, 9, 2, 0, 5, 5],
+            "duration": 4.02
         },
         {
             "name": "corenfeld2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Corenfeld-HD-02",
-            "scoreWord": [0, 10, 7, 0, 0, 8, 10, 10, 0, 0, 0, 10, 10, 10, 2, 0, 9, 10]
+            "scoreWord": [0, 10, 7, 0, 0, 8, 10, 10, 0, 0, 0, 10, 10, 10, 2, 0, 9, 10],
+            "duration": 5.17
         },
         {
             "name": "cohen1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Cohen-HD-01",
-            "scoreWord": [9, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 8, 6, 0, 0]
+            "scoreWord": [9, 5, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 8, 6, 0, 0],
+            "duration": 3.40
         },
         {
             "name": "cohen2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Cohen-HD-02",
-            "scoreWord": [4, 6, 5, 0, 0, 0, 0, 0, 2, 7, 0, 0, 0, 0, 5, 0, 0, 0]
+            "scoreWord": [4, 6, 5, 0, 0, 0, 0, 0, 2, 7, 0, 0, 0, 0, 5, 0, 0, 0],
+            "duration": 3.08
         },
         {
             "name": "cohen3",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Cohen-HD-03",
-            "scoreWord": [0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 0, 6, 0, 7, 0, 0, 0, 0]
+            "scoreWord": [0, 0, 0, 0, 0, 0, 4, 0, 0, 5, 0, 6, 0, 7, 0, 0, 0, 0],
+            "duration": 1.46
         },
         {
             "name": "tortu1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Tortu-HD-01",
-            "scoreWord": [8, 0, 10, 8, 0, 0, 10, 0, 5, 0, 5, 4, 6, 8, 7, 0, 6, 10]
+            "scoreWord": [8, 0, 10, 8, 0, 0, 10, 0, 5, 0, 5, 4, 6, 8, 7, 0, 6, 10],
+            "duration": 3.37
         },
         {
             "name": "tortu2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Tortu-HD-02",
-            "scoreWord": [0, 0, 10, 8, 0, 0, 10, 0, 2, 0, 8, 7, 6, 8, 0, 0, 6, 10]
+            "scoreWord": [0, 0, 10, 8, 0, 0, 10, 0, 2, 0, 8, 7, 6, 8, 0, 0, 6, 10],
+            "duration": 4.35
         },
         {
             "name": "aurore1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Aurore-HD-01",
-            "scoreWord": [6, 0, 10, 8, 0, 0, 9, 0, 10, 0, 0, 0, 0, 8, 7, 0, 7, 8]
+            "scoreWord": [6, 0, 10, 8, 0, 0, 9, 0, 10, 0, 0, 0, 0, 8, 7, 0, 7, 8],
+            "duration": 4.25
         },
         {
             "name": "andre1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/andre-HD-01",
-            "scoreWord": [5, 0, 8, 6, 0, 0, 9, 0, 8, 0, 0, 10, 4, 8, 3, 0, 7, 8]
+            "scoreWord": [5, 0, 8, 6, 0, 0, 9, 0, 8, 0, 0, 10, 4, 8, 3, 0, 7, 8],
+            "duration": 5.28
         },
         {
             "name": "elodie1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/elodie-HD-01",
-            "scoreWord": [5, 8, 8, 0, 0, 0, 4, 4, 3, 0, 0, 3, 1, 9, 5, 0, 10, 7]
+            "scoreWord": [5, 8, 8, 0, 0, 0, 4, 4, 3, 0, 0, 3, 1, 9, 5, 0, 10, 7],
+            "duration": 2.58
         },
         {
             "name": "cynthia1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Cynthia-HD-01",
-            "scoreWord": [3, 5, 7, 0, 10, 5, 10, 0, 0, 7, 3, 5, 0, 7, 3, 0, 3, 5]
+            "scoreWord": [3, 5, 7, 0, 10, 5, 10, 0, 0, 7, 3, 5, 0, 7, 3, 0, 3, 5],
+            "duration": 2.57
         },
         {
             "name": "dolto1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Dolto-HD-01",
-            "scoreWord": [10, 9, 8, 0, 0, 0, 7, 0, 8, 0, 0, 0, 2, 6, 10, 4, 0, 5]
+            "scoreWord": [10, 9, 8, 0, 0, 0, 7, 0, 8, 0, 0, 0, 2, 6, 10, 4, 0, 5],
+            "duration": 1.44
         },
         {
             "name": "dolto2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Dolto-HD-02",
-            "scoreWord": [0, 0, 9, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+            "scoreWord": [0, 0, 9, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+            "duration": 1.35
         },
         {
             "name": "dolto3",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Dolto-HD-03",
-            "scoreWord": [9, 8, 5, 0, 0, 0, 9, 0, 10, 4, 0, 0, 0, 0, 10, 5, 0, 5]
+            "scoreWord": [9, 8, 5, 0, 0, 0, 9, 0, 10, 4, 0, 0, 0, 0, 10, 5, 0, 5],
+            "duration": 5.15
         },
         {
             "name": "dolto4",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Dolto-HD-04",
-            "scoreWord": [5, 5, 2, 0, 0, 0, 9, 9, 2, 0, 0, 10, 5, 5, 9, 5, 3, 5]
+            "scoreWord": [5, 5, 2, 0, 0, 0, 9, 9, 2, 0, 0, 10, 5, 5, 9, 5, 3, 5],
+            "duration": 5.50
         },
         {
             "name": "kircher1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Kircher-HD-01",
-            "scoreWord": [0, 0, 10, 0, 0, 0, 8, 0, 6, 0, 0, 0, 0, 0, 0, 0, 4, 4]
+            "scoreWord": [0, 0, 10, 0, 0, 0, 8, 0, 6, 0, 0, 0, 0, 0, 0, 0, 4, 4],
+            "duration": 3.29
         },
         {
             "name": "kircher2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Kircher-HD-02",
-            "scoreWord": [0, 0, 3, 0, 0, 0, 7, 0, 1, 7, 0, 9, 0, 8, 0, 0, 3, 4]
+            "scoreWord": [0, 0, 3, 0, 0, 0, 7, 0, 1, 7, 0, 9, 0, 8, 0, 0, 3, 4],
+            "duration": 4.10
         },
         {
             "name": "perlman1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Perlman-HD-01",
-            "scoreWord": [8, 3, 5, 0, 0, 0, 5, 5, 0, 4, 0, 0, 4, 0, 6, 3, 0, 0]
+            "scoreWord": [8, 3, 5, 0, 0, 0, 5, 5, 0, 4, 0, 0, 4, 0, 6, 3, 0, 0],
+            "duration": 7.26
         },
         {
             "name": "perlman2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Perlman-HD-02",
-            "scoreWord": [0, 0, 7, 10, 0, 0, 9, 0, 0, 5, 7, 10, 8, 8, 0, 7, 0, 0]
+            "scoreWord": [0, 0, 7, 10, 0, 0, 9, 0, 0, 5, 7, 10, 8, 8, 0, 7, 0, 0],
+            "duration": 6.26
         },
         {
             "name": "perlman3",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Perlman-HD-03",
-            "scoreWord": [10, 9, 5, 5, 0, 0, 10, 0, 0, 10, 0, 8, 8, 9, 0, 7, 0, 0]
+            "scoreWord": [10, 9, 5, 5, 0, 0, 10, 0, 0, 10, 0, 8, 8, 9, 0, 7, 0, 0],
+            "duration": 3.58
         },
         {
             "name": "perlman4",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/Perlman-HD-04",
-            "scoreWord": [0, 0, 10, 0, 0, 0, 8, 0, 0, 7, 0, 6, 8, 9, 0, 5, 0, 0]
+            "scoreWord": [0, 0, 10, 0, 0, 0, 8, 0, 0, 7, 0, 6, 8, 9, 0, 5, 0, 0],
+            "duration": 6.39
         },
         {
             "name": "fiction1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/AIMEZ-MOI-HD",
-            "scoreWord": [7, 9, 4, 0, 0, 0, 4, 0, 10, 9, 0, 1, 4, 3, 0, 4, 3, 4]
+            "scoreWord": [7, 9, 4, 0, 0, 0, 4, 0, 10, 9, 0, 1, 4, 3, 0, 4, 3, 4],
+            "duration": 3.53
         },
         {
             "name": "fiction2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/APPELEZ-MOI-HD",
-            "scoreWord": [0, 10, 9, 0, 0, 0, 5, 5, 5, 0, 0, 1, 5, 8, 0, 0, 10, 3]
+            "scoreWord": [0, 10, 9, 0, 0, 0, 5, 5, 5, 0, 0, 1, 5, 8, 0, 0, 10, 3],
+            "duration": 1.08
         },
         {
             "name": "fiction3",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/DROIT-HD",
-            "scoreWord": [2, 0, 3, 0, 0, 0, 8, 0, 7, 0, 1, 7, 1, 2, 8, 0, 0, 0]
+            "scoreWord": [2, 0, 3, 0, 0, 0, 8, 0, 7, 0, 1, 7, 1, 2, 8, 0, 0, 0],
+            "duration": 1.16
         },
         {
             "name": "fiction4",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/ECOUTEZ-MOI-HD",
-            "scoreWord": [0, 7, 9, 0, 0, 0, 10, 1, 7, 0, 0, 7, 9, 9, 8, 9, 8, 3]
+            "scoreWord": [0, 7, 9, 0, 0, 0, 10, 1, 7, 0, 0, 7, 9, 9, 8, 9, 8, 3],
+            "duration": 2.26
         },
         {
             "name": "fiction5",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/EMBRASSEZ-MOI-HD",
-            "scoreWord": [2, 8, 1, 0, 0, 0, 1, 1, 6, 0, 0, 10, 1, 1, 0, 6, 6, 10]
+            "scoreWord": [2, 8, 1, 0, 0, 0, 1, 1, 6, 0, 0, 10, 1, 1, 0, 6, 6, 10],
+            "duration": 3.35
         },
         {
             "name": "fiction6",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/ENGAGEZ-MOI-HD",
-            "scoreWord": [0, 3, 10, 0, 0, 0, 8, 0, 7, 0, 0, 0, 8, 7, 3, 5, 3, 8]
+            "scoreWord": [0, 3, 10, 0, 0, 0, 8, 0, 7, 0, 0, 0, 8, 7, 3, 5, 3, 8],
+            "duration": 2.44
         },
         {
             "name": "fiction7",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/ENNEMI-HD",
-            "scoreWord": [0, 0, 10, 0, 0, 2, 8, 8, 7, 0, 10, 9, 10, 1, 5, 1, 0, 0]
+            "scoreWord": [0, 0, 10, 0, 0, 2, 8, 8, 7, 0, 10, 9, 10, 1, 5, 1, 0, 0],
+            "duration": 1.28
         },
         {
             "name": "fiction8",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/IDEAL-HD",
-            "scoreWord": [1, 4, 0, 5, 0, 0, 3, 0, 5, 0, 0, 3, 0, 9, 8, 0, 5, 10]
+            "scoreWord": [1, 4, 0, 5, 0, 0, 3, 0, 5, 0, 0, 3, 0, 9, 8, 0, 5, 10],
+            "duration": 0.58
         },
         {
             "name": "fiction9",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/MONDEALENVERS-HD",
-            "scoreWord": [1, 0, 0, 2, 0, 2, 0, 0, 6, 8, 0, 8, 5, 1, 4, 7, 0, 1]
+            "scoreWord": [1, 0, 0, 2, 0, 2, 0, 0, 6, 8, 0, 8, 5, 1, 4, 7, 0, 1],
+            "duration": 1.09
         },
         {
             "name": "fiction10",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/REALITE-HD",
-            "scoreWord": [10, 5, 5, 0, 0, 0, 8, 5, 3, 0, 2, 6, 5, 7, 7, 0, 0, 8]
+            "scoreWord": [10, 5, 5, 0, 0, 0, 8, 5, 3, 0, 2, 6, 5, 7, 7, 0, 0, 8],
+            "duration": 2.30
         },
         {
             "name": "fiction11",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/REVOLUTION1-HD",
-            "scoreWord": [0, 6, 0, 10, 0, 0, 2, 0, 0, 0, 0, 1, 0, 7, 8, 0, 2, 3]
+            "scoreWord": [0, 6, 0, 10, 0, 0, 2, 0, 0, 0, 0, 1, 0, 7, 8, 0, 2, 3],
+            "duration": 3.29
         },
         {
             "name": "fiction12",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/REVOLUTION2-HD",
-            "scoreWord": [3, 0, 3, 7, 10, 0, 7, 2, 6, 0, 3, 2, 8, 5, 2, 0, 0, 10]
+            "scoreWord": [3, 0, 3, 7, 10, 0, 7, 2, 6, 0, 3, 2, 8, 5, 2, 0, 0, 10],
+            "duration": 0.38
         },
         {
             "name": "definition1",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/AVENIR-HD",
-            "scoreWord": [0, 0, 9, 0, 0, 0, 7, 0, 5, 0, 0, 0, 0, 10, 0, 0, 10, 10]
+            "scoreWord": [0, 0, 9, 0, 0, 0, 7, 0, 5, 0, 0, 0, 0, 10, 0, 0, 10, 10],
+            "duration": 0.14
         },
         {
             "name": "definition2",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/LUTTE-HD",
-            "scoreWord": [0, 8, 0, 0, 0, 0, 5, 5, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0]
+            "scoreWord": [0, 8, 0, 0, 0, 0, 5, 5, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0],
+            "duration": 0.9
         },
         {
             "name": "definition3",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/POLITIQUE-1-HD",
-            "scoreWord": [1, 0, 2, 0, 0, 1, 1, 0, 0, 0, 1, 8, 0, 10, 0, 0, 0, 1]
+            "scoreWord": [1, 0, 2, 0, 0, 1, 1, 0, 0, 0, 1, 8, 0, 10, 0, 0, 0, 1],
+            "duration": 0.29
         },
         {
             "name": "definition4",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/POLITIQUE-2-HD",
-            "scoreWord": [0, 0, 1, 0, 0, 1, 2, 0, 0, 0, 2, 2, 0, 0, 0, 2, 0, 0]
+            "scoreWord": [0, 0, 1, 0, 0, 1, 2, 0, 0, 0, 2, 2, 0, 0, 0, 2, 0, 0],
+            "duration": 0.16
         },
         {
             "name": "definition5",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/POLITIQUE-3-HD",
-            "scoreWord": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 1, 10, 0, 0, 0, 0]
+            "scoreWord": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 1, 10, 0, 0, 0, 0],
+            "duration": 0.10
         },
         {
             "name": "definition6",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/QUE1-HD",
-            "scoreWord": [0, 0, 0, 0, 0, 10, 10, 0, 0, 0, 10, 10, 0, 10, 0, 0, 10, 0]
+            "scoreWord": [0, 0, 0, 0, 0, 10, 10, 0, 0, 0, 10, 10, 0, 10, 0, 0, 10, 0],
+            "duration": 0.19
         },
         {
             "name": "definition7",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/QUE2-HD",
-            "scoreWord": [0, 0, 0, 0, 10, 10, 10, 9, 5, 0, 10, 10, 10, 0, 0, 10, 0, 0]
+            "scoreWord": [0, 0, 0, 0, 10, 10, 10, 9, 5, 0, 10, 10, 10, 0, 0, 10, 0, 0],
+            "duration": 0.17
         },
         {
             "name": "definition8",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/QUE3-HD",
-            "scoreWord": [0, 0, 0, 0, 10, 10, 10, 9, 5, 0, 10, 10, 10, 0, 0, 10, 0, 0]
+            "scoreWord": [0, 0, 0, 0, 10, 10, 10, 9, 5, 0, 10, 10, 10, 0, 0, 10, 0, 0],
+            "duration": 0.21
         },
         {
             "name": "definition9",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/QUE4-HD",
-            "scoreWord": [0, 0, 0, 0, 0, 0, 10, 0, 5, 0, 10, 10, 0, 10, 0, 0, 0, 0]
+            "scoreWord": [0, 0, 0, 0, 0, 0, 10, 0, 5, 0, 10, 10, 0, 10, 0, 0, 0, 0],
+            "duration": 0.43
         },
         {
             "name": "definition10",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/REVE-HD",
-            "scoreWord": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 10]
+            "scoreWord": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 10, 10],
+            "duration": 0.35
         },
         {
             "name": "definition11",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/VIE-HD",
-            "scoreWord": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0]
+            "scoreWord": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0],
+            "duration": 0.8
         },
         {
             "name": "chant4",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/ZEBU-CHANT_4-HD",
-            "scoreWord": [0, 10, 0, 0, 0, 0, 0, 0, 5, 0, 0, 2, 10, 0, 5, 5, 5, 0]
+            "scoreWord": [0, 10, 0, 0, 0, 0, 0, 0, 5, 0, 0, 2, 10, 0, 5, 5, 5, 0],
+            "duration": 6.50
         },
         {
             "name": "chant5",
             "src": "http://dvvsyrlsr21oz.cloudfront.net/IDEE-CHANT_5-HD",
-            "scoreWord": [8, 0, 0, 0, 0, 0, 9, 0, 5, 0, 0, 7, 0, 7, 7, 7, 1, 5]
+            "scoreWord": [8, 0, 0, 0, 0, 0, 9, 0, 5, 0, 0, 7, 0, 7, 7, 7, 1, 5],
+            "duration": 2.56
         }
    
     ]
diff -r dbd46ed42b0d -r d92196482ad9 web/static/res/json/sequences2.json
--- a/web/static/res/json/sequences2.json	Wed Dec 12 04:01:13 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-{
-    "part1" : [
-        {
-            "src": "static/res/video/boucle/FOND2",
-            "in": 0,
-            "out": 5
-        }
-    ],
-
-    "part2" : [
-        {
-            "src": "static/res/video/boucle/FOND1",
-            "in": 0,
-            "out": 4
-        }
-    ],    
-    
-    "part3" : [
-        {
-            "src": "static/res/video/boucle/FOND3",
-            "in": 0,
-            "out": 10
-        }
-    ]    
-}
\ No newline at end of file
diff -r dbd46ed42b0d -r d92196482ad9 web/transition.html
--- a/web/transition.html	Wed Dec 12 04:01:13 2012 +0100
+++ b/web/transition.html	Wed Dec 12 15:54:57 2012 +0100
@@ -40,7 +40,7 @@
 				--><div class="fullScreen_vcentering box_vcentering white big_txt">
 					<p><a href="partage.html">Partagez</a></p>
 					<p><a href="choix.html">Recommencez</a></p>
-					<p class="margin_exeption"><a href="niv2_hp.html">Prolongez l'expériance</a></p>
+					<p class="margin_exeption"><a href="niv2_hp.html">Prolongez l'expérience</a></p>
 					<p><a href="/">Crédits</a></p>
 					<p><a href="/">The End, etc.</a></p>
 				</div>