From 51fe50a8119251f74adac04f52406aba90edfc0e Mon Sep 17 00:00:00 2001 From: Gustavo Salazar Date: Tue, 2 Oct 2012 12:18:56 -0500 Subject: [PATCH] Do not play video file according to audio file. --- .../playback/presentation/css/bbb.playback.css | 2 +- .../playback/presentation/playback.js | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/record-and-playback/presentation/playback/presentation/css/bbb.playback.css b/record-and-playback/presentation/playback/presentation/css/bbb.playback.css index 0d4aa96b99..3b65c4622d 100755 --- a/record-and-playback/presentation/playback/presentation/css/bbb.playback.css +++ b/record-and-playback/presentation/playback/presentation/css/bbb.playback.css @@ -59,7 +59,7 @@ br{ width: 100%; } -#webcam{ +.webcam{ width: 402px; height: 300px; } diff --git a/record-and-playback/presentation/playback/presentation/playback.js b/record-and-playback/presentation/playback/presentation/playback.js index dc5fa0bb05..0908a3d12a 100644 --- a/record-and-playback/presentation/playback/presentation/playback.js +++ b/record-and-playback/presentation/playback/presentation/playback.js @@ -239,15 +239,21 @@ function checkUrl(url) load_video = function(){ console.log("Loading video") + document.getElementById("video").style.visibility = "hidden" var video = document.getElementById("webcam") video.setAttribute('src', RECORDINGS + '/video/webcams.webm'); video.setAttribute('type','video/webm'); - video.setAttribute('id','webcam'); - var time_manager = Popcorn("#video"); + video.setAttribute('class','webcam'); + video.setAttribute('id','video'); + /*var time_manager = Popcorn("#video"); var pc_webcam = Popcorn("#webcam"); time_manager.on( "timeupdate", function() { pc_webcam.currentTime( this.currentTime() ); - }); + });*/ + + video.setAttribute('data-timeline-sources', SLIDES_XML); + video.setAttribute('controls',''); + video.setAttribute('autoplay','autoplay'); } load_audio = function() { @@ -284,12 +290,14 @@ document.addEventListener( "DOMContentLoaded", function() { chat = document.getElementById("chat") chat.style.height = "560px"; chat.style.backgroundColor = "white"; + load_audio(); } - load_audio(); + //load_audio(); load_script("lib/writing.js") generateThumbnails(); }, false); +