npapi-vlc | branch: master | Felix Paul Kühne <fkue...@videolan.org> | Thu Sep 
10 12:25:47 2015 +0200| [c906bad12eeb7eaa08eb1bc0dab0b504bb6a7afb] | committer: 
Felix Paul Kühne

mac: enable UI update timer for any Safari release

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=c906bad12eeb7eaa08eb1bc0dab0b504bb6a7afb
---

 extras/macosx/dmg_setup.scpt |  Bin 4826 -> 4826 bytes
 npapi/vlcplugin_mac.mm       |    7 ++-----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/extras/macosx/dmg_setup.scpt b/extras/macosx/dmg_setup.scpt
index 72eee0e..edfefc9 100644
Binary files a/extras/macosx/dmg_setup.scpt and b/extras/macosx/dmg_setup.scpt 
differ
diff --git a/npapi/vlcplugin_mac.mm b/npapi/vlcplugin_mac.mm
index fd682e6..55e49fc 100644
--- a/npapi/vlcplugin_mac.mm
+++ b/npapi/vlcplugin_mac.mm
@@ -316,11 +316,8 @@ NPError VlcPluginMac::get_root_layer(void *value)
         [(VLCPerInstanceStorage *)this->_perInstanceStorage 
browserRootLayer].cppPlugin = this;
 
         const char *userAgent = NPN_UserAgent(this->getBrowser());
-        if (strstr(userAgent, "Safari") && strstr(userAgent, "Version/5")) {
-            NSLog(@"Safari 5 detected, deploying UI update timer");
-            [[(VLCPerInstanceStorage *)this->_perInstanceStorage 
browserRootLayer] performSelector:@selector(startUIUpdateTimer) withObject:nil 
afterDelay:1.];
-        } else if (strstr(userAgent, "Safari") && strstr(userAgent, 
"Version/9")) {
-            NSLog(@"Safari 9 detected, deploying UI update timer");
+        if (strstr(userAgent, "Safari")) {
+            NSLog(@"Safari detected, deploying UI update timer");
             [[(VLCPerInstanceStorage *)this->_perInstanceStorage 
browserRootLayer] performSelector:@selector(startUIUpdateTimer) withObject:nil 
afterDelay:1.];
         } else if (strstr(userAgent, "Firefox")) {
             NSLog(@"Firefox detected, deploying UI update timer");

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to