From 8cae11d588ceeee4041623006d881750584ac3f5 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 15:52:11 -0400 Subject: [PATCH 1/5] CC-4478: Library: audio preview check should be skipped if file does not exist -fixed --- airtime_mvc/public/js/airtime/library/spl.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 3ee9a22ef..79c761efd 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -366,7 +366,7 @@ var AIRTIME = (function(AIRTIME){ //and verify whether they can be previewed by the browser or not. If not //then the playlist element is greyed out mod.validatePlaylistElements = function(){ - $.each($(".big_play"), function(index, value){ + $.each($(".big_play ui-icon-play"), function(index, value){ if ($(value).attr('blockId') === undefined) { var mime = $(value).attr("data-mime-type"); if (isAudioSupported(mime)) { From 7a958ec8b681ccec3767e27c4eb2811efa6ae8bf Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 18 Sep 2012 15:52:16 -0400 Subject: [PATCH 2/5] formatting --- airtime_mvc/application/models/User.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 326e04940..63b82820a 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -1,9 +1,9 @@ Date: Tue, 18 Sep 2012 16:10:55 -0400 Subject: [PATCH 3/5] added comments --- python_apps/media-monitor2/media/monitor/pure.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py index 910ff2c2e..b6f3897ff 100644 --- a/python_apps/media-monitor2/media/monitor/pure.py +++ b/python_apps/media-monitor2/media/monitor/pure.py @@ -257,6 +257,8 @@ def normalized_metadata(md, original_path): 'MDATA_KEY_FILEPATH' : lambda x: os.path.normpath(x), 'MDATA_KEY_BPM' : lambda x: x[0:8], 'MDATA_KEY_MIME' : lambda x: x.replace('audio/vorbis','audio/ogg'), + # Whenever 0 is reported we change it to empty + #'MDATA_KEY_BITRATE' : lambda x: '' if str(x) == '0' else x } new_md = remove_whitespace(new_md) # remove whitespace fields From d55915d6492d1d10d17341f1096120d054ad8fac Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 18 Sep 2012 16:40:23 -0400 Subject: [PATCH 4/5] naming convention fix --- .../application/models/formatters/BitrateFormatter.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/formatters/BitrateFormatter.php b/airtime_mvc/application/models/formatters/BitrateFormatter.php index 58bd56c64..f1455ca74 100644 --- a/airtime_mvc/application/models/formatters/BitrateFormatter.php +++ b/airtime_mvc/application/models/formatters/BitrateFormatter.php @@ -17,12 +17,12 @@ class BitrateFormatter public function format() { - $Kbps = bcdiv($this->_bitrate, 1000, 0); + $kbps = bcdiv($this->_bitrate, 1000, 0); - if ($Kbps == 0) { + if ($kbps == 0) { return ""; } else { - return "{$Kbps} Kbps"; + return "$kbps Kbps"; } } } From 54ab58a9c7524cd0d92c841339a230afe4b852af Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 18 Sep 2012 16:49:45 -0400 Subject: [PATCH 5/5] CC-4465: Calendar: Remove warning icon on empty shows if show is in the past -removed (commented out) code for this ticket -postponing for now --- .../public/js/airtime/schedule/full-calendar-functions.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 5e95a31c8..d31e34476 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -255,8 +255,8 @@ function eventRender(event, element, view) { } //add scheduled show content empty icon - addIcon = checkEmptyShowStatus(event); - if (!addIcon) { + //addIcon = checkEmptyShowStatus(event); + //if (!addIcon) { if (view.name === 'agendaDay' || view.name === 'agendaWeek') { if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) { if (event.soundcloud_id === -1) { @@ -282,7 +282,7 @@ function eventRender(event, element, view) { } } } - } + //} //rebroadcast icon if((view.name === 'agendaDay' || view.name === 'agendaWeek') && event.rebroadcast === 1) { @@ -518,6 +518,7 @@ function addQtipToSCIcons(ele){ * This gets checked when we are deciding if the show-empty icon should be added * at the beginning of an event render callback. */ +/* function checkEmptyShowStatus(e) { var currDate = new Date(); var endTime; @@ -541,6 +542,7 @@ function checkEmptyShowStatus(e) { return showOver; } } +*/ //Alert the error and reload the page //this function is used to resolve concurrency issue