diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index c71958ab4..1b7ee4e05 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -91,7 +91,7 @@ class Playlist { { $seconds = $p_seconds; $milliseconds = intval(($seconds - intval($seconds)) * 1000); - $milliStr = str_pad($milliseconds, 6, '0'); + $milliStr = str_pad($milliseconds, 3, '0'); $hours = floor($seconds / 3600); $seconds -= $hours * 3600; $minutes = floor($seconds / 60); @@ -387,9 +387,14 @@ class Playlist { ->orderByDbPosition() ->filterByDbPlaylistId($this->id) ->find(); - + + $i = 0; + $offset = 0; foreach ($rows as $row) { - $files[] = $row->toArray(BasePeer::TYPE_FIELDNAME, true, true); + $files[$i] = $row->toArray(BasePeer::TYPE_FIELDNAME, true, true); + $offset += Playlist::playlistTimeToSeconds($files[$i]['cliplength']); + $files[$i]['offset'] = Playlist::secondsToPlaylistTime($offset); + $i++; } return $files; diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index 590f071cf..08085623f 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -15,6 +15,7 @@ </div> <div class="text-row"> <span class="spl_artist"><?php echo $item["CcFiles"]['artist_name'] ?></span> + <span class="spl_offset"><?php echo $item["offset"]?></span> </div> <?php if($i < count($this->pl->getContents()) -1): ?> <div id="fade_<?php echo $i ?>" class="spl_fade_control ui-state-default"></div> diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index d05a0a0d3..4a7fc1bf1 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -81,6 +81,13 @@ color:#d5d5d5; } +.spl_offset { + float: right; + text-align: right; + padding: 0 5px 0 0; + color: #D5D5D5; +} + /*#spl_editor { height: 50px; }*/