Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
martin 2011-06-24 16:02:01 -04:00
parent 21cf476bfb e84f80a7f9
commit a5d2597875
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/controllers/LibraryController.php
View File

@ -147,6 +147,12 @@ class LibraryController extends Zend_Controller_Action
{
$post = $this->getRequest()->getPost();
$datatables = StoredFile::searchFilesForPlaylistBuilder($post);
//format clip lengh to 1 decimal
foreach($datatables["aaData"] as &$data){
$sec = Playlist::playlistTimeToSeconds($data[5]);
$data[5] = Playlist::secondsToPlaylistTime($sec);
}
die(json_encode($datatables));
}

16
airtime_mvc/application/models/Playlist.php
View File

@ -90,8 +90,11 @@ class Playlist {
public static function secondsToPlaylistTime($p_seconds)
{
$seconds = $p_seconds;
$milliseconds = intval(($seconds - intval($seconds)) * 1000);
$milliStr = str_pad($milliseconds, 3, '0', STR_PAD_LEFT);
$rounded = round($seconds, 1);
list($dump, $milliStr) = explode('.', $rounded);
if($milliStr == NULL){
$milliStr = 0;
}
$hours = floor($seconds / 3600);
$seconds -= $hours * 3600;
$minutes = floor($seconds / 60);
@ -398,7 +401,10 @@ class Playlist {
$offset = 0;
foreach ($rows as $row) {
$files[$i] = $row->toArray(BasePeer::TYPE_FIELDNAME, true, true);
$offset += Playlist::playlistTimeToSeconds($files[$i]['cliplength']);
// display only upto 1 decimal place by calling secondsToPlaylistTime
$clipSec = Playlist::playlistTimeToSeconds($files[$i]['cliplength']);
$files[$i]['cliplength'] = Playlist::secondsToPlaylistTime($clipSec);
$offset += $clipSec;
$files[$i]['offset'] = Playlist::secondsToPlaylistTime($offset);
$i++;
}
@ -413,7 +419,9 @@ class Playlist {
if(is_null($res))
return '00:00:00';
$sec = Playlist::playlistTimeToSeconds($res);
$res = Playlist::secondsToPlaylistTime($sec);
return $res;
}

11
airtime_mvc/application/views/scripts/playlist/update.phtml
View File

@ -1,7 +1,8 @@
<?php if (count($this->pl->getContents())) : ?>
<?php
$items = $this->pl->getContents();
if (count($items)) : ?>
<?php $i = 0; ?>
<?php foreach($this->pl->getContents() as $item) : ?>
<?php foreach($items as $item) : ?>
<li class="ui-state-default" id="spl_<?php echo $i ?>">
<div class="list-item-container">
<a href="javascript:void(0);" class="big_play"
@ -17,7 +18,7 @@
<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): ?>
<?php if($i < count($items) -1): ?>
<div id="fade_<?php echo $i ?>" class="spl_fade_control ui-state-default"></div>
<?php endif; ?>
<span class="ui-icon ui-icon-closethick"></span>
@ -25,7 +26,7 @@
<div id="cues_<?php echo $i ?>" class="cue-edit clearfix" style="display: none"></div>
<?php if($i < count($this->pl->getContents()) -1): ?>
<?php if($i < count($items) -1): ?>
<div id="crossfade_<?php echo $i ?>-<?php echo $i+1 ?>" class="crossfade clearfix" style="display: none"></div>
<?php endif; ?>