Merge branch 'master' of dev.sourcefabric.org:campcaster
This commit is contained in:
Naomi
commit
7bdfd60ea9
|
|
@ -298,28 +298,3 @@ class ScheduleController extends Zend_Controller_Action
|
|||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -479,10 +479,10 @@ class Schedule {
|
|||
|
||||
private static function GetPreviousItems($timeNow, $prevCount = 1){
|
||||
global $CC_CONFIG, $CC_DBC;
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable], $CC_CONFIG[filesTable]"
|
||||
." WHERE ($CC_CONFIG[scheduleTable].ends < TIMESTAMP '$timeNow')"
|
||||
." AND ($CC_CONFIG[scheduleTable].file_id = $CC_CONFIG[filesTable].id)"
|
||||
." ORDER BY $CC_CONFIG[scheduleTable].starts DESC"
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable] st, $CC_CONFIG[filesTable] ft"
|
||||
." WHERE (st.ends < TIMESTAMP '$timeNow')"
|
||||
." AND (st.file_id = ft.id)"
|
||||
." ORDER BY st.starts DESC"
|
||||
." LIMIT $prevCount";
|
||||
$rows = $CC_DBC->GetAll($sql);
|
||||
return $rows;
|
||||
|
|
@ -491,20 +491,21 @@ class Schedule {
|
|||
private static function GetCurrentlyPlaying($timeNow){
|
||||
global $CC_CONFIG, $CC_DBC;
|
||||
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable], $CC_CONFIG[filesTable]"
|
||||
." WHERE ($CC_CONFIG[scheduleTable].starts < TIMESTAMP '$timeNow')"
|
||||
." AND ($CC_CONFIG[scheduleTable].ends > TIMESTAMP '$timeNow')"
|
||||
." AND ($CC_CONFIG[scheduleTable].file_id = $CC_CONFIG[filesTable].id)";
|
||||
$sql = "SELECT *, pt.name as playlistName FROM $CC_CONFIG[scheduleTable] st, $CC_CONFIG[filesTable] ft, $CC_CONFIG[playListTable] pt"
|
||||
." WHERE (st.starts < TIMESTAMP '$timeNow')"
|
||||
." AND (st.ends > TIMESTAMP '$timeNow')"
|
||||
." AND (st.playlist_id = pt.id)"
|
||||
." AND (st.file_id = ft.id)";
|
||||
$rows = $CC_DBC->GetAll($sql);
|
||||
return $rows;
|
||||
}
|
||||
|
||||
private static function GetNextItems($timeNow, $nextCount = 1) {
|
||||
global $CC_CONFIG, $CC_DBC;
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable], $CC_CONFIG[filesTable]"
|
||||
." WHERE ($CC_CONFIG[scheduleTable].starts > TIMESTAMP '$timeNow')"
|
||||
." AND ($CC_CONFIG[scheduleTable].file_id = $CC_CONFIG[filesTable].id)"
|
||||
." ORDER BY $CC_CONFIG[scheduleTable].starts"
|
||||
$sql = "SELECT * FROM $CC_CONFIG[scheduleTable] st, $CC_CONFIG[filesTable] ft"
|
||||
." WHERE (st.starts > TIMESTAMP '$timeNow')"
|
||||
." AND (st.file_id = ft.id)"
|
||||
." ORDER BY st.starts"
|
||||
." LIMIT $nextCount";
|
||||
$rows = $CC_DBC->GetAll($sql);
|
||||
return $rows;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<div>Volume</div>
|
||||
</div>
|
||||
|
||||
<div id='col1' style='float:left; width: 30%; height: 100%;'>
|
||||
<div id='col1' style='float:left; width: 25%; height: 100%;'>
|
||||
<div>Show: <span id='show'></span></div>
|
||||
<div>Playlist: <span id='playlist'></span></div>
|
||||
<div>Host: <span id='host'></span></div>
|
||||
|
|
@ -15,7 +15,8 @@
|
|||
<div>Upcoming: <span id='next'></span></div>
|
||||
</div>
|
||||
|
||||
<div id='list0' style='float:left; width: 30%; height: 100%;'></div>
|
||||
<div>Start: <span id='start'></span> End: <span id='end'></span></div>
|
||||
<div id='progressbar'></div>
|
||||
<div id='list0' style='float:left; width: 35%; height: 100%;'></div>
|
||||
<div>Start: <span id='start'></span></div>
|
||||
<div>End: <span id='end'></span></div>
|
||||
<div><span id='progressbar'></span> <span id='songposition'></span> | <span id='songlength'></span></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -27,24 +27,11 @@ echo "***************************\n";
|
|||
|
||||
require_once(dirname(__FILE__).'/../application/configs/conf.php');
|
||||
require_once(dirname(__FILE__).'/installInit.php');
|
||||
//require_once(dirname(__FILE__).'/../backend/cron/Cron.php');
|
||||
|
||||
function airtime_uninstall_delete_files($p_path)
|
||||
{
|
||||
if (!empty($p_path) && (strlen($p_path) > 4)) {
|
||||
if (file_exists($p_path)) {
|
||||
$dir = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($p_path), RecursiveIteratorIterator::CHILD_FIRST);
|
||||
|
||||
for ($dir->rewind(); $dir->valid(); $dir->next()) {
|
||||
if ($dir->isDir()) {
|
||||
rmdir($dir->getPathname());
|
||||
} else {
|
||||
unlink($dir->getPathname());
|
||||
}
|
||||
}
|
||||
rmdir($p_path);
|
||||
}
|
||||
}
|
||||
$command = "rm -rf $p_path";
|
||||
exec($command);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
|
|
@ -212,10 +199,6 @@ foreach ($cron->ct->getByType(CRON_CMD) as $id => $line) {
|
|||
$cron->closeCrontab();
|
||||
echo "done.\n";
|
||||
*/
|
||||
//------------------------------------------------------------------------
|
||||
// Delete files
|
||||
//------------------------------------------------------------------------
|
||||
airtime_uninstall_delete_files($CC_CONFIG['storageDir']);
|
||||
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
|
|
@ -236,6 +219,13 @@ if ($results == 0) {
|
|||
echo " * Nothing to delete..\n";
|
||||
}
|
||||
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
// Delete files
|
||||
//------------------------------------------------------------------------
|
||||
airtime_uninstall_delete_files($CC_CONFIG['storageDir']);
|
||||
|
||||
|
||||
echo "************************************\n";
|
||||
echo "* StorageServer Uninstall Complete *\n";
|
||||
echo "************************************\n";
|
||||
|
|
@ -8,9 +8,9 @@ var nextSongs;
|
|||
var currentElem;
|
||||
|
||||
function init(elemID) {
|
||||
var currentElem = $("#" + elemID).attr("style", "z-index: 1; width: 100%; left: 0px; right: 0px; bottom: 0px; color: white; min-height: 100px; background-color: #cc3300;");
|
||||
var currentElem = $("#" + elemID).attr("style", "z-index: 1; width: 100%; left: 0px; right: 0px; bottom: 0px; color: black; min-height: 100px; background-color: #FEF1B5;");
|
||||
|
||||
$('#progressbar').progressBar(0);
|
||||
$('#progressbar').progressBar(0, {showText : false});
|
||||
|
||||
getScheduleFromServer();
|
||||
updateProgressBarValue();
|
||||
|
|
@ -67,6 +67,30 @@ function getTrackInfo(song){
|
|||
return song.track_title + " - " + song.artist_name + " - " + song.album_title;
|
||||
}
|
||||
|
||||
function convertToHHMMSS(timeInMS){
|
||||
var time = parseInt(timeInMS);
|
||||
|
||||
var hours = parseInt(time / 3600000);
|
||||
time -= 3600000*hours;
|
||||
|
||||
var minutes = parseInt(time / 60000);
|
||||
time -= 60000*minutes;
|
||||
|
||||
var seconds = parseInt(time / 1000);
|
||||
|
||||
hours = "" + hours;
|
||||
minutes = "" + minutes;
|
||||
seconds = "" + seconds;
|
||||
|
||||
if (hours.length == 1)
|
||||
hours = "0" + hours;
|
||||
if (minutes.length == 1)
|
||||
minutes = "0" + minutes;
|
||||
if (seconds.length == 1)
|
||||
seconds = "0" + seconds;
|
||||
return "" + hours + ":" + minutes + ":" + seconds;
|
||||
}
|
||||
|
||||
function updatePlaylist(){
|
||||
/* Column 0 update */
|
||||
$('#listen');
|
||||
|
|
@ -78,8 +102,8 @@ function updatePlaylist(){
|
|||
$('#host').empty();
|
||||
for (var i=0; i<currentSong.length; i++){
|
||||
$('#show').append(currentSong[i].show);
|
||||
$('#playlist').append(currentSong[i].playlist);
|
||||
$('#host').append(currentSong[i].host);
|
||||
$('#playlist').append(currentSong[i].playlistname);
|
||||
$('#host').append(currentSong[i].creator);
|
||||
}
|
||||
|
||||
/* Column 2 update */
|
||||
|
|
@ -90,7 +114,7 @@ function updatePlaylist(){
|
|||
$('#previous').append(getTrackInfo(previousSongs[i]));
|
||||
}
|
||||
for (var i=0; i<currentSong.length; i++){
|
||||
$('#current').append(getTrackInfo(currentSongs[i]));
|
||||
$('#current').append(getTrackInfo(currentSong[i]));
|
||||
}
|
||||
for (var i=0; i<nextSongs.length; i++){
|
||||
$('#next').append(getTrackInfo(nextSongs[i]));
|
||||
|
|
@ -98,10 +122,14 @@ function updatePlaylist(){
|
|||
|
||||
/* Column 3 update */
|
||||
$('#start').empty();
|
||||
$('#end').empty();
|
||||
$('#end').empty();
|
||||
$('#songposition').empty();
|
||||
$('#songlength').empty();
|
||||
for (var i=0; i<currentSong.length; i++){
|
||||
$('#start').append(currentSong[i].starts);
|
||||
$('#end').append(currentSong[i].ends);
|
||||
$('#start').append(currentSong[i].starts.substring(currentSong[i].starts.indexOf(" ")+1));
|
||||
$('#end').append(currentSong[i].ends.substring(currentSong[i].starts.indexOf(" ")+1));
|
||||
$('#songposition').append(convertToHHMMSS(estimatedSchedulePosixTime - currentSong[i].songStartPosixTime));
|
||||
$('#songlength').append(currentSong[i].clip_length);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue