equal
deleted
inserted
replaced
308 } |
308 } |
309 var videoid = "video_" + media.id, |
309 var videoid = "video_" + media.id, |
310 videoEl = $('<video>'), |
310 videoEl = $('<video>'), |
311 width = $(".video").width(), |
311 width = $(".video").width(), |
312 height = $(".video").height(), |
312 height = $(".video").height(), |
|
313 /* |
313 mp4_file = videourl.replace(/\.webm$/i,'.mp4'), |
314 mp4_file = videourl.replace(/\.webm$/i,'.mp4'), |
314 webm_file = videourl.replace(/\.mp4$/i,'.webm'), |
315 webm_file = videourl.replace(/\.mp4$/i,'.webm'), |
|
316 */ |
315 mp4_src = $('<source>'), |
317 mp4_src = $('<source>'), |
316 webm_src = $('<source>'); |
318 /* |
|
319 webm_src = $('<source>'), |
|
320 */ |
|
321 lastseektime, |
|
322 currentseektime; |
317 mp4_src.attr({ |
323 mp4_src.attr({ |
318 src: mp4_file, |
324 src: videourl, //mp4_file, |
319 type: "video/mp4" |
325 type: "video/mp4" |
320 }); |
326 }); |
|
327 /* |
321 webm_src.attr({ |
328 webm_src.attr({ |
322 src: webm_file, |
329 src: webm_file, |
323 type: "video/webm" |
330 type: "video/webm" |
324 }); |
331 }); |
|
332 */ |
325 videoEl.attr({ |
333 videoEl.attr({ |
326 id : videoid, |
334 id : videoid, |
327 width : width, |
335 width : width, |
328 height : height |
336 height : height |
329 }).css({ |
337 }).css({ |
331 left: 0, |
339 left: 0, |
332 top: 0, |
340 top: 0, |
333 width : width, |
341 width : width, |
334 height : height |
342 height : height |
335 }); |
343 }); |
336 videoEl.append(mp4_src).append(webm_src); |
344 videoEl.append(mp4_src); //.append(webm_src); |
337 $(".video").append(videoEl); |
345 $(".video").append(videoEl); |
338 |
346 |
339 media.show = function() { |
347 media.show = function() { |
340 videoEl.show(); |
348 videoEl.show(); |
341 } |
349 } |
347 |
355 |
348 // Binding functions to Popcorn |
356 // Binding functions to Popcorn |
349 |
357 |
350 media.on("setcurrenttime", function(_milliseconds) { |
358 media.on("setcurrenttime", function(_milliseconds) { |
351 if (media.loaded) { |
359 if (media.loaded) { |
352 popcorn.currentTime(_milliseconds / 1000); |
360 if (!media.seeking) { |
353 media.seeking = true; |
361 lastseektime = currentseektime = _milliseconds.valueOf(); |
354 setTimeout(showSeek,200); |
362 popcorn.currentTime(currentseektime / 1000); |
|
363 media.seeking = true; |
|
364 setTimeout(showSeek,200); |
|
365 } else { |
|
366 lastseektime = _milliseconds.valueOf(); |
|
367 } |
355 } |
368 } |
356 }); |
369 }); |
357 |
370 |
358 media.on("setvolume", function(_vol) { |
371 media.on("setvolume", function(_vol) { |
359 media.volume = _vol; |
372 media.volume = _vol; |
411 popcorn.on("pause", function() { |
424 popcorn.on("pause", function() { |
412 media.trigger("pause"); |
425 media.trigger("pause"); |
413 }); |
426 }); |
414 |
427 |
415 popcorn.on("seeked", function() { |
428 popcorn.on("seeked", function() { |
416 media.trigger("seeked"); |
429 if (currentseektime !== lastseektime) { |
|
430 currentseektime = lastseektime; |
|
431 popcorn.currentTime(currentseektime / 1000); |
|
432 media.seeking = true; |
|
433 } else { |
|
434 media.trigger("seeked"); |
|
435 } |
417 }); |
436 }); |
418 |
437 |
419 // Binding UI Events and Mashup Playing to Media |
438 // Binding UI Events and Mashup Playing to Media |
420 |
439 |
421 media.on("loadedmetadata", function() { |
440 media.on("loadedmetadata", function() { |