From 983bbc5fc5e0ae3bac6969072d56e3948c87941e Mon Sep 17 00:00:00 2001 From: Martin Konecny <martin.konecny@gmail.com> Date: Thu, 13 Sep 2012 12:24:53 -0400 Subject: [PATCH] CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track -better file type detection --- .../public/js/airtime/common/audioplaytest.js | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/public/js/airtime/common/audioplaytest.js b/airtime_mvc/public/js/airtime/common/audioplaytest.js index 81bd6c95b..9e5218468 100644 --- a/airtime_mvc/public/js/airtime/common/audioplaytest.js +++ b/airtime_mvc/public/js/airtime/common/audioplaytest.js @@ -1,10 +1,17 @@ -var audio = new Audio(); -supportedAudio = {}; -supportedAudio["audio/ogg"] = !!audio.canPlayType && audio.canPlayType('audio/ogg; codecs="vorbis"') != ""; -supportedAudio["audio/mp3"] = !!audio.canPlayType && audio.canPlayType('audio/mp3') != ""; -supportedAudio["audio/mp4"] = !!audio.canPlayType && audio.canPlayType('audio/mp4') != ""; -supportedAudio["audio/x-flac"] = !!audio.canPlayType && audio.canPlayType('audio/x-flac') != ""; function isAudioSupported(mime){ - return mime in supportedAudio && supportedAudio[mime]; + var audio = new Audio(); + + var bMime = null; + if (mime.indexOf("ogg") != -1 || mime.indexOf("vorbis") != -1) { + bMime = 'audio/ogg; codecs="vorbis"'; + } else if (mime.indexOf("mp3") != -1) { + bMime = "audio/mp3"; + } else if (mime.indexOf("mp4") != -1) { + bMime = "audio/mp4"; + } else if (mime.indexOf("flac") != -1) { + bMime = "audio/x-flac"; + } + + return !!bMime && !!audio.canPlayType && audio.canPlayType(bMime) != ""; }