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

CC-2415:subsecod-offset-in-playlist 

- Displays 1 decimal place on all length and offset in playlist
builder
- secondsToPlaylistTime() function returns time with 1 decimal
millisecond
This commit is contained in:
James 2011-06-24 15:51:21 -04:00
parent e05645f523
commit db7b996288
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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