From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 16 Apr 2013 11:44:38 +0000 (+0400)
Subject: remove js-based player, better mp3 support detection for html5 audio
X-Git-Tag: 1.7.9~25^2~206
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=40fe2d73821788e7c202191dc7b94b025585d338;p=tt-rss.git

remove js-based player, better mp3 support detection for html5 audio
---

diff --git a/classes/rpc.php b/classes/rpc.php
index 1569a9a3..b6d55286 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -334,6 +334,7 @@ class RPC extends Handler_Protected {
 	function sanityCheck() {
 		$_SESSION["hasAudio"] = $_REQUEST["hasAudio"] === "true";
 		$_SESSION["hasSandbox"] = $_REQUEST["hasSandbox"] === "true";
+		$_SESSION["hasMp3"] = $_REQUEST["hasMp3"] === "true";
 
 		$reply = array();
 
diff --git a/include/functions.php b/include/functions.php
index 01852064..87eb3d6a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2990,19 +2990,12 @@
 		if (strpos($ctype, "audio/") === 0) {
 
 			if ($_SESSION["hasAudio"] && (strpos($ctype, "ogg") !== false ||
-				strpos($_SERVER['HTTP_USER_AGENT'], "Chrome") !== false ||
-				strpos($_SERVER['HTTP_USER_AGENT'], "Safari") !== false )) {
+				$_SESSION["hasMp3"])) {
 
-				$id = 'AUDIO-' . uniqid();
-
-				$entry .= "<audio id=\"$id\"\" controls style='display : none'>
+				$entry .= "<audio controls>
 					<source type=\"$ctype\" src=\"$url\"></source>
 					</audio>";
 
-				$entry .= "<span onclick=\"player(this)\"
-					title=\"".__("Click to play")."\" status=\"0\"
-					class=\"player\" audio-id=\"$id\">".__("Play")."</span>";
-
 			} else {
 
 				$entry .= "<object type=\"application/x-shockwave-flash\"
diff --git a/js/tt-rss.js b/js/tt-rss.js
index a572e532..fe12297d 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -248,11 +248,15 @@ function init() {
 
 		loading_set_progress(20);
 
-		var hasAudio = !!((myAudioTag = document.createElement('audio')).canPlayType);
+		var a = document.createElement('audio');
+
+		var hasAudio = !!a.canPlayType;
 		var hasSandbox = "sandbox" in document.createElement("iframe");
+		var hasMp3 = !!(a.canPlayType && a.canPlayType('audio/mpeg;').replace(/no/, ''));
 
 		new Ajax.Request("backend.php",	{
 			parameters: {op: "rpc", method: "sanityCheck", hasAudio: hasAudio,
+				hasMp3: hasMp3,
 				hasSandbox: hasSandbox},
 			onComplete: function(transport) {
 					backend_sanity_check_callback(transport);
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 519ab344..ddee1e46 100644
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -2027,34 +2027,6 @@ function initHeadlinesMenu() {
 	}
 }
 
-
-function player(elem) {
-	var aid = elem.getAttribute("audio-id");
-	var status = elem.getAttribute("status");
-
-	var audio = $(aid);
-
-	if (audio) {
-		if (status == 0) {
-			audio.play();
-			status = 1;
-			elem.innerHTML = __("Playing...");
-			elem.title = __("Click to pause");
-			elem.addClassName("playing");
-		} else {
-			audio.pause();
-			status = 0;
-			elem.innerHTML = __("Play");
-			elem.title = __("Click to play");
-			elem.removeClassName("playing");
-		}
-
-		elem.setAttribute("status", status);
-	} else {
-		alert("Your browser doesn't seem to support HTML5 audio.");
-	}
-}
-
 function cache_set(id, obj) {
 	//console.log("cache_set: " + id);
 	if (has_storage)