From 58f4727f173334ff690fa640de83e1921ea3376a Mon Sep 17 00:00:00 2001 From: James Date: Wed, 18 Apr 2012 16:06:23 -0400 Subject: [PATCH 1/4] CC-3666: Default Playlist fade in/out time is not zero. - fixed --- airtime_mvc/application/models/Preference.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index 8d4faf7d4..c57747e2a 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -154,7 +154,8 @@ class Application_Model_Preference $fade = self::GetValue("default_fade"); if ($fade === "") { - return null; + // the default value of the fade is 00.500000 + return "00.500000"; } $fade = number_format($fade, 6); From 79f3473dfe777688a788b5aec96a563d4c1fae91 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 18 Apr 2012 16:13:52 -0400 Subject: [PATCH 2/4] CC-3674: Cannot add songs to 'Now Playing' nor Playlists -fixed for Now Playing --- airtime_mvc/application/models/airtime/CcSchedule.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/airtime_mvc/application/models/airtime/CcSchedule.php b/airtime_mvc/application/models/airtime/CcSchedule.php index 75a01e758..87532e2c6 100644 --- a/airtime_mvc/application/models/airtime/CcSchedule.php +++ b/airtime_mvc/application/models/airtime/CcSchedule.php @@ -111,6 +111,7 @@ class CcSchedule extends BaseCcSchedule { $dt = $v; } else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) { + $v = str_pad($v, 9, "0", STR_PAD_LEFT); $dt = DateTime::createFromFormat("s.u", $v); } else { @@ -138,6 +139,7 @@ class CcSchedule extends BaseCcSchedule { $dt = $v; } else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) { + $v = str_pad($v, 9, "0", STR_PAD_LEFT); $dt = DateTime::createFromFormat("s.u", $v); } else { From 8588857defb13c90971898b969b364f0a40d1687 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 18 Apr 2012 16:49:32 -0400 Subject: [PATCH 3/4] CC-3674: Cannot add songs to 'Now Playing' nor Playlists -fixed --- airtime_mvc/application/models/Preference.php | 2 ++ airtime_mvc/application/models/airtime/CcSchedule.php | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php index c57747e2a..0786152c3 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -159,6 +159,8 @@ class Application_Model_Preference } $fade = number_format($fade, 6); + //fades need 2 leading zeros for DateTime conversion + $fade = str_pad($fade, 9, "0", STR_PAD_LEFT); return $fade; } diff --git a/airtime_mvc/application/models/airtime/CcSchedule.php b/airtime_mvc/application/models/airtime/CcSchedule.php index 87532e2c6..75a01e758 100644 --- a/airtime_mvc/application/models/airtime/CcSchedule.php +++ b/airtime_mvc/application/models/airtime/CcSchedule.php @@ -111,7 +111,6 @@ class CcSchedule extends BaseCcSchedule { $dt = $v; } else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) { - $v = str_pad($v, 9, "0", STR_PAD_LEFT); $dt = DateTime::createFromFormat("s.u", $v); } else { @@ -139,7 +138,6 @@ class CcSchedule extends BaseCcSchedule { $dt = $v; } else if (preg_match('/^[0-9]{1,2}(\.\d{1,6})?$/', $v)) { - $v = str_pad($v, 9, "0", STR_PAD_LEFT); $dt = DateTime::createFromFormat("s.u", $v); } else { From de89db7c366641468269870e08f488f553f7ee41 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 18 Apr 2012 18:24:50 -0400 Subject: [PATCH 4/4] CC-3668: Live stream player - volume control needs improved usability -in progress --- .../application/views/scripts/dashboard/stream-player.phtml | 2 +- airtime_mvc/public/js/jplayer/skin/jplayer.blue.monday.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml index 042531b68..de20357df 100644 --- a/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml +++ b/airtime_mvc/application/views/scripts/dashboard/stream-player.phtml @@ -75,7 +75,7 @@ $(document).ready(function(){