From 2293fcda01aced78f2dd467aeb8925298e43b650 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 13 Sep 2012 14:22:13 -0400 Subject: [PATCH] CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track - fixed --- airtime_mvc/application/controllers/AudiopreviewController.php | 1 + airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/AudiopreviewController.php b/airtime_mvc/application/controllers/AudiopreviewController.php index 6e579045c..69b82939e 100644 --- a/airtime_mvc/application/controllers/AudiopreviewController.php +++ b/airtime_mvc/application/controllers/AudiopreviewController.php @@ -184,6 +184,7 @@ class AudiopreviewController extends Zend_Controller_Action 'element_artist' => isset($track['artist_name'])?$track['artist_name']:"", 'element_id' => isset($track['id'])?$track['id']:"", 'element_position' => isset($track['position'])?$track['position']:"", + 'mime' => isset($track['mime'])?$track['mime']:"" ); /* If the track type is static we know it must be diff --git a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js index 2964dbe63..01c205acd 100644 --- a/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js +++ b/airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js @@ -144,7 +144,7 @@ function buildplaylist(p_url, p_playIndex) { mp3:data[index]['uri'] }; } - if (media) { + if (media && isAudioSupported(data[index]['mime'])) { myPlaylist[index] = media; } // we should create a map according to the new position in the