From 2a1ac0ddb911481a7e3cf7fc2ca728b9fb9252bb Mon Sep 17 00:00:00 2001
From: Naomi <naomiaro@gmail.com>
Date: Tue, 30 Apr 2013 16:27:31 -0400
Subject: [PATCH] CC-2301 : updating playlist offsets in playlist builder to
 reflect crossfade overlaps.

---
 airtime_mvc/application/models/Block.php                 | 3 +++
 airtime_mvc/application/models/Playlist.php              | 9 +++++++++
 .../application/views/scripts/playlist/update.phtml      | 2 +-
 airtime_mvc/public/js/airtime/library/spl.js             | 2 ++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php
index c99ed22c3..931445d2d 100644
--- a/airtime_mvc/application/models/Block.php
+++ b/airtime_mvc/application/models/Block.php
@@ -195,6 +195,7 @@ SELECT pc.id AS id,
        pc.cueout,
        pc.fadein,
        pc.fadeout,
+       pc.trackoffset,
        bl.type,
        f.LENGTH AS orig_length,
        f.id AS item_id,
@@ -235,7 +236,9 @@ SQL;
             $row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
             $row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']);
             
+            $trackoffset = $row['trackoffset'];
             $offset += $clipSec;
+            $offset -= $trackoffset;
             $offset_cliplength = Application_Common_DateHelper::secondsToPlaylistTime($offset);
 
             //format the length for UI.
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index ad734df3f..d0df1b19d 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -161,6 +161,7 @@ class Application_Model_Playlist implements Application_Model_LibraryEditable
                    pc.cueout,
                    pc.fadein,
                    pc.fadeout,
+                   pc.trackoffset,
                    f.id AS item_id,
                    f.track_title,
                    f.artist_name AS creator,
@@ -188,6 +189,7 @@ SQL;
                             pc.cueout,
                             pc.fadein,
                             pc.fadeout,
+                            pc.trackoffset,
                             ws.id AS item_id,
                             (ws.name || ': ' || ws.url) AS title,
                             sub.login AS creator,
@@ -208,6 +210,7 @@ SQL;
                             pc.cueout,
                             pc.fadein,
                             pc.fadeout,
+                            pc.trackoffset,
                             bl.id AS item_id,
                             bl.name AS title,
                             sbj.login AS creator,
@@ -222,6 +225,7 @@ SQL;
               AND pc.TYPE = 2)) AS temp
    ORDER BY temp.position;
 SQL;
+        //Logging::info($sql);
 
         $params = array(
             ':playlist_id1'=>$this->id, ':playlist_id2'=>$this->id, ':playlist_id3'=>$this->id);
@@ -233,13 +237,18 @@ SQL;
 
         $offset = 0;
         foreach ($rows as &$row) {
+        	
+        	//Logging::info($row);
+        	
             $clipSec = Application_Common_DateHelper::playlistTimeToSeconds($row['length']);
             $row['trackSec'] = $clipSec;
             
             $row['cueInSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cuein']);
             $row['cueOutSec'] = Application_Common_DateHelper::playlistTimeToSeconds($row['cueout']);
             
+            $trackoffset = $row['trackoffset'];
             $offset += $clipSec;
+            $offset -= $trackoffset;
             $offset_cliplength = Application_Common_DateHelper::secondsToPlaylistTime($offset);
 
             //format the length for UI.
diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml
index b0d2b6151..39ee90fa6 100644
--- a/airtime_mvc/application/views/scripts/playlist/update.phtml
+++ b/airtime_mvc/application/views/scripts/playlist/update.phtml
@@ -94,7 +94,7 @@ if (($i < count($items) -1) && ($items[$i+1]['type'] == 0)) {
             	'item2Url' => $nextFileUrl,
                 'fadeOut' => $items[$i]['fadeout'],
                 'fadeIn' => $items[$i+1]['fadein'],
-            	'offset' => $items[$i]['trackSec'],
+            	'offset' => $items[$i]['trackSec'] - $items[$i+1]['trackoffset'],
                 'cueIn1' => $items[$i]['cueInSec'],
             	'cueOut1' => $items[$i]['cueOutSec'],
             	'cueIn2' => $items[$i+1]['cueInSec'],
diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js
index 1d13a525c..3174bcb4b 100644
--- a/airtime_mvc/public/js/airtime/library/spl.js
+++ b/airtime_mvc/public/js/airtime/library/spl.js
@@ -167,6 +167,7 @@ var AIRTIME = (function(AIRTIME){
             function(json){
             	
             	$el.dialog('destroy');
+            	$el.remove();
 
                 if (json.error !== undefined){
                     playlistError(json);
@@ -199,6 +200,7 @@ var AIRTIME = (function(AIRTIME){
             function(json){
             	
             	$el.dialog('destroy');
+            	$el.remove();
 
                 if (json.error !== undefined){
                     playlistError(json);