From fe916ec043a3f729657151e148077e60b4b5ff6b Mon Sep 17 00:00:00 2001 From: Naomi Date: Wed, 8 May 2013 11:43:53 -0400 Subject: [PATCH 1/4] CC-2301 : adding in crossfade durations to smart blocks. --- airtime_mvc/application/models/Block.php | 3 +++ airtime_mvc/public/js/waveformplaylist/playout.js | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 931445d2d..1a068fd08 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -33,6 +33,7 @@ class Application_Model_Block implements Application_Model_LibraryEditable "cueout" => "00:00:00", "fadein" => "0.0", "fadeout" => "0.0", + "crossfadeDuration" => 0 ); //using propel's phpNames. @@ -101,6 +102,7 @@ class Application_Model_Block implements Application_Model_LibraryEditable $this->blockItem["fadein"] = Application_Model_Preference::GetDefaultFadeIn(); $this->blockItem["fadeout"] = Application_Model_Preference::GetDefaultFadeOut(); + $this->blockItem["crossfadeDuration"] = Application_Model_Preference::GetDefaultCrossfadeDuration(); $this->con = isset($con) ? $con : Propel::getConnection(CcBlockPeer::DATABASE_NAME); $this->id = $this->block->getDbId(); @@ -390,6 +392,7 @@ SQL; $row->setDbCueout($info["cueout"]); $row->setDbFadein(Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"])); $row->setDbFadeout(Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"])); + $row->setDbTrackOffset($info["crossfadeDuration"]); $row->save($this->con); // above save result update on cc_block table on length column. // but $this->block doesn't get updated automatically diff --git a/airtime_mvc/public/js/waveformplaylist/playout.js b/airtime_mvc/public/js/waveformplaylist/playout.js index 8a30098b2..a2a156b37 100644 --- a/airtime_mvc/public/js/waveformplaylist/playout.js +++ b/airtime_mvc/public/js/waveformplaylist/playout.js @@ -82,7 +82,9 @@ AudioPlayout.prototype.loadData = function (audioData, cb) { that.buffer = buffer; cb(buffer); }, - Error + function(err) { + console.log("err(decodeAudioData): "+err); + } ); }; From d8ba15fac4dd72abb8d266f54032c2807359bec5 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 8 May 2013 12:05:45 -0400 Subject: [PATCH 2/4] CC-5091: Linked Show: Cannot change the start time ahead --- airtime_mvc/application/services/SchedulerService.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/services/SchedulerService.php b/airtime_mvc/application/services/SchedulerService.php index 2cf5711fc..7fe3ca6f8 100644 --- a/airtime_mvc/application/services/SchedulerService.php +++ b/airtime_mvc/application/services/SchedulerService.php @@ -68,8 +68,12 @@ class Application_Service_SchedulerService $ccSchedules = CcScheduleQuery::create() ->filterByDbInstanceId($instanceIds, Criteria::IN) ->find(); + + $interval = new DateInterval("PT".abs($diff)."S"); + if ($diff < 0) { + $interval->invert = 1; + } foreach ($ccSchedules as $ccSchedule) { - $interval = new DateInterval("PT".$diff."S"); $start = new DateTime($ccSchedule->getDbStarts()); $newStart = $start->add($interval); $end = new DateTime($ccSchedule->getDbEnds()); From fae0b2f873511d755e3492f350121953aa9df02e Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 8 May 2013 13:11:30 -0400 Subject: [PATCH 3/4] CC-5111: Please make upgrade detect the tracks already scheduled and added in playlist --- install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql b/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql index 4b091c618..9474f5d37 100644 --- a/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql +++ b/install_minimal/upgrades/airtime-2.4.0/data/upgrade.sql @@ -3,3 +3,11 @@ INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.4.0'); DELETE FROM cc_pref WHERE keystr = 'stream_type'; INSERT INTO cc_pref (keystr, valstr) VALUES ('stream_type', 'ogg, mp3, opus, aac'); + +UPDATE cc_files +SET is_scheduled = true +WHERE id IN (SELECT DISTINCT(file_id) FROM cc_schedule WHERE playout_status != -1); + +UPDATE cc_files +SET is_playlist = true +WHERE id IN (SELECT DISTINCT(file_id) FROM cc_playlistcontents); From 9dbec4636ac070d50416043bde12a85a4b8f7c40 Mon Sep 17 00:00:00 2001 From: denise Date: Wed, 8 May 2013 13:43:27 -0400 Subject: [PATCH 4/4] CC-5106: Calendar: Context menu "Show contents" is missing for past shows --- airtime_mvc/application/services/CalendarService.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/airtime_mvc/application/services/CalendarService.php b/airtime_mvc/application/services/CalendarService.php index 1c963fc45..0db7d4e2d 100644 --- a/airtime_mvc/application/services/CalendarService.php +++ b/airtime_mvc/application/services/CalendarService.php @@ -67,6 +67,11 @@ class Application_Service_CalendarService "name"=> $text, "icon" => "soundcloud"); } + } else { + $menu["content"] = array( + "name"=> _("Show Content"), + "icon" => "overview", + "url" => $baseUrl."schedule/show-content-dialog"); } } else { //Show content can be modified from the calendar if: