[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linterna-magica-commit] [56] Merge r55 to branch 0.0.9.
From: |
Ivaylo Valkov |
Subject: |
[linterna-magica-commit] [56] Merge r55 to branch 0.0.9. |
Date: |
Mon, 02 May 2011 13:07:45 +0000 |
Revision: 56
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=56
Author: valkov
Date: 2011-05-02 13:07:44 +0000 (Mon, 02 May 2011)
Log Message:
-----------
Merge r55 to branch 0.0.9.
Revision Links:
--------------
http://svn.sv.gnu.org/viewvc/?view=rev&root=linterna-magica&revision=55
Modified Paths:
--------------
branches/0.0.9/src/lm_create_video_object.js
branches/0.0.9/src/lm_xhr.js
Property Changed:
----------------
branches/0.0.9/
Property changes on: branches/0.0.9
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:6,9,11,13,19,21,52
+ /trunk:6,9,11,13,19,21,52,55
Modified: branches/0.0.9/src/lm_create_video_object.js
===================================================================
--- branches/0.0.9/src/lm_create_video_object.js 2011-05-02 12:53:44 UTC
(rev 55)
+++ branches/0.0.9/src/lm_create_video_object.js 2011-05-02 13:07:44 UTC
(rev 56)
@@ -187,6 +187,24 @@
if (object_data.link)
{
var mime = object_data.mime ? object_data.mime : "video/flv";
+
+ // Fix for video/mp4 (and other QuickTime clips) for
+ // totemNarrowSpace plugin. Fixes these issues of
+ // totemNarrowSpace plugin:
+ // - No API for fullscreen.
+ // - The UA it sends is different from the browser, Vimeo does
+ // not load.
+ // With video/flv totemCone plugin will load.
+ if (/mp4|m4v|quicktime/i)
+ {
+ var mp4 = navigator.mimeTypes["video/mp4"];
+ if (mp4 && mp4.enabledPlugin && mp4.enabledPlugin.name &&
+ /totem/i.test(mp4.enabledPlugin.description))
+ {
+ mime = "video/flv";
+ }
+ }
+
object_tag.setAttribute("type", mime);
object_tag.setAttribute("data", object_data.link);
}
Modified: branches/0.0.9/src/lm_xhr.js
===================================================================
--- branches/0.0.9/src/lm_xhr.js 2011-05-02 12:53:44 UTC (rev 55)
+++ branches/0.0.9/src/lm_xhr.js 2011-05-02 13:07:44 UTC (rev 56)
@@ -254,10 +254,15 @@
hd_links.unshift(hd_link);
}
- // Explicitly force video/flv. We depend on this with
- // Totem. This way the plugin uses the user-agent of the
- // browser.
- mime = "video/flv";
+ // Vimeo web server sends the clips as
+ // video/mp4. totemNarrowSpace plugin (plays video/mp4)
+ // sends custom UA. This prevents the video to load. Must
+ // use video/flv, so totemCone plugin could start and send
+ // UA of the browser. totemNarrowSpace/QuickTime plugin
+ // have other issues as well. Could be forced to
+ // video/flv, but there is a better fix in
+ // create_video_object();
+ mime = "video/mp4";
}
if (/4videosharing\.com/i.test(host))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [linterna-magica-commit] [56] Merge r55 to branch 0.0.9.,
Ivaylo Valkov <=