From 43d67c921de2338a65b689bd4a66ac9c30f61828 Mon Sep 17 00:00:00 2001
From: Naomi Aro <naomiaro@gmail.com>
Date: Mon, 27 Feb 2012 21:29:02 +0100
Subject: [PATCH] CC-3174 : showbuilder

adding cue/fade columns to table

fixing schedule fade out
putting default fade between files not in a playlist.
---
 airtime_mvc/application/forms/GeneralPreferences.php  |  4 ++--
 airtime_mvc/application/models/Schedule.php           |  2 ++
 airtime_mvc/application/models/Scheduler.php          |  7 +++++++
 airtime_mvc/application/models/ShowBuilder.php        | 11 ++++++++++-
 airtime_mvc/application/models/airtime/CcSchedule.php |  2 +-
 airtime_mvc/public/js/airtime/showbuilder/builder.js  |  6 +++++-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index 66be09ce1..9e71aed56 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -11,7 +11,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
 
         $defaultFade = Application_Model_Preference::GetDefaultFade();
         if($defaultFade == ""){
-            $defaultFade = '00.500000';
+            $defaultFade = '00.000000';
         }
 
         //Station name
@@ -29,7 +29,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
         //Default station fade
         $this->addElement('text', 'stationDefaultFade', array(
             'class'      => 'input_text',
-            'label'      => 'Default Fade:',
+            'label'      => 'Default Fade (s):',
             'required'   => false,
             'filters'    => array('StringTrim'),
             'validators' => array(array('regex', false,
diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php
index 1c2100d35..367278bc7 100644
--- a/airtime_mvc/application/models/Schedule.php
+++ b/airtime_mvc/application/models/Schedule.php
@@ -316,6 +316,8 @@ class Application_Model_Schedule {
         si.record AS si_record, si.rebroadcast AS si_rebroadcast, si.id AS si_id, si.last_scheduled AS si_last_scheduled,
 
         sched.starts AS sched_starts, sched.ends AS sched_ends, sched.id AS sched_id,
+        sched.cue_in AS cue_in, sched.cue_out AS cue_out,
+        sched.fade_in AS fade_in, sched.fade_out AS fade_out,
 
         ft.track_title AS file_track_title, ft.artist_name AS file_artist_name,
         ft.album_title AS file_album_title, ft.length AS file_length
diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index 13417c06f..f066bceed 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -40,6 +40,13 @@ class Application_Model_Scheduler {
                 $data["cliplength"] = $file->getDbLength();
                 $data["cueout"] = $file->getDbLength();
 
+                $defaultFade = Application_Model_Preference::GetDefaultFade();
+                if ($defaultFade !== "") {
+                    //fade is in format SS.uuuuuu
+                    $data["fadein"] = $defaultFade;
+                    $data["fadeout"] = $defaultFade;
+                }
+
                 $files[] = $data;
             }
         }
diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php
index 88844029e..773a13046 100644
--- a/airtime_mvc/application/models/ShowBuilder.php
+++ b/airtime_mvc/application/models/ShowBuilder.php
@@ -26,7 +26,11 @@ class Application_Model_ShowBuilder {
         "title" => "",
         "creator" => "",
         "album" => "",
-        "timestamp" => null
+        "timestamp" => null,
+        "cuein" => "",
+        "cueout" => "",
+        "fadein" => "",
+        "fadeout" => ""
     );
 
     /*
@@ -184,6 +188,11 @@ class Application_Model_ShowBuilder {
             $row["creator"] = $p_item["file_artist_name"];
             $row["album"] = $p_item["file_album_title"];
 
+            $row["cuein"] = $p_item["cue_in"];
+            $row["cueout"] = $p_item["cue_out"];
+            $row["fadein"] = $p_item["fade_in"];
+            $row["fadeout"] = $p_item["fade_out"];
+
             $this->contentDT = $schedEndDT;
         }
         //show is empty
diff --git a/airtime_mvc/application/models/airtime/CcSchedule.php b/airtime_mvc/application/models/airtime/CcSchedule.php
index 67af99cff..1e8b77133 100644
--- a/airtime_mvc/application/models/airtime/CcSchedule.php
+++ b/airtime_mvc/application/models/airtime/CcSchedule.php
@@ -176,7 +176,7 @@ class CcSchedule extends BaseCcSchedule {
             }
         }
 
-        $this->fadeIout = $dt->format('H:i:s.u');
+        $this->fade_out = $dt->format('H:i:s.u');
         $this->modifiedColumns[] = CcSchedulePeer::FADE_OUT;
 
         return $this;
diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js
index d82093b96..d3ef80bd6 100644
--- a/airtime_mvc/public/js/airtime/showbuilder/builder.js
+++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js
@@ -201,7 +201,11 @@ $(document).ready(function() {
         /* runtime */{"mDataProp": "runtime", "sTitle": "Duration", "sClass": "library_length"},
         /* title */{"mDataProp": "title", "sTitle": "Title"},
         /* creator */{"mDataProp": "creator", "sTitle": "Creator"},
-        /* album */{"mDataProp": "album", "sTitle": "Album"}
+        /* album */{"mDataProp": "album", "sTitle": "Album"},
+        /* cue in */{"mDataProp": "cuein", "sTitle": "Cue In", "bVisible": false},
+        /* cue out */{"mDataProp": "cueout", "sTitle": "Cue Out", "bVisible": false},
+        /* fade in */{"mDataProp": "fadein", "sTitle": "Fade In", "bVisible": false},
+        /* fade out */{"mDataProp": "fadeout", "sTitle": "Fade Out", "bVisible": false}
         ],
         
         "bJQueryUI": true,