diff --git a/legacy/application/assets.json b/legacy/application/assets.json index 96ffb6af7..8f2535191 100644 --- a/legacy/application/assets.json +++ b/legacy/application/assets.json @@ -49,7 +49,7 @@ "css/users.css": "94c94817a8505ff4dfcd090987859a7e", "css/waveform.css": "4ce429708933e6da1a2f3bdb2a01db52", "js/airtime/airtime_bootstrap.js": "9575982385f6c74e2b4ec61e30214a7c", - "js/airtime/audiopreview/preview_jplayer.js": "133b4b9a3436716a8367d353f1658da3", + "js/airtime/audiopreview/preview_jplayer.js": "d3402345279a9f4b86b381bae87d6de8", "js/airtime/buttons/buttons.js": "1a984b1e01262816c899c5fa3f12e3cd", "js/airtime/common/audioplaytest.js": "93737dabc4cce4fcdcc6d54acf86d16d", "js/airtime/common/common.js": "8c0675f5a1c8d95323b2f3983c658f62", diff --git a/legacy/public/js/airtime/audiopreview/preview_jplayer.js b/legacy/public/js/airtime/audiopreview/preview_jplayer.js index 1cc60d0f8..d48715936 100644 --- a/legacy/public/js/airtime/audiopreview/preview_jplayer.js +++ b/legacy/public/js/airtime/audiopreview/preview_jplayer.js @@ -27,7 +27,7 @@ $(document).ready(function () { [], //array of songs will be filled with below's json call { swfPath: baseUrl + "js/jplayer", - supplied: "oga, mp3, m4v, m4a, wav", + supplied: "oga, mp3, m4v, m4a, wav, flac", size: { width: "0px", height: "0px", @@ -161,6 +161,12 @@ function buildplaylist(p_url, p_playIndex) { artist: data[index]["element_artist"], wav: data[index]["uri"], }; + } else if (data[index]["element_flac"] != undefined) { + media = { + title: data[index]["element_title"], + artist: data[index]["element_artist"], + flac: data[index]["uri"], + }; } else { // skip this track since it's not supported console.log("continue"); @@ -177,6 +183,8 @@ function buildplaylist(p_url, p_playIndex) { key = "m4a"; } else if (mime.search(/wav/i) > 0) { key = "wav"; + } else if (mime.search(/flac/i) > 0) { + key = "flac"; } if (key) { @@ -243,6 +251,8 @@ function playOne(uri, mime) { key = "m4a"; } else if (mime.search(/wav/i) > 0) { key = "wav"; + } else if (mime.search(/flac/i) > 0) { + key = "flac"; } if (key) {