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

Merge branch 'master' of dev.sourcefabric.org:airtime 

Conflicts:
	dev_tools/pr.sh
This commit is contained in:
Paul Baranowski 2011-04-15 14:46:07 -04:00
parent aab1ad16e1 b80c0ed65a
commit 6d39af6fb9
6 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/models/Schedule.php
View File

@ -190,7 +190,8 @@ class ScheduleGroup {
." LEFT JOIN $CC_CONFIG[showInstances] as si" ." LEFT JOIN $CC_CONFIG[showInstances] as si"
." ON st.instance_id = si.id" ." ON st.instance_id = si.id"
." WHERE st.group_id=$this->groupId" ." WHERE st.group_id=$this->groupId"
." AND st.starts < si.ends"; ." AND st.starts < si.ends"
." ORDER BY st.starts";
return $CC_DBC->GetAll($sql); return $CC_DBC->GetAll($sql);
} }

2
airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml
View File

@ -28,7 +28,7 @@
<div id="show_progressbar"></div> <div id="show_progressbar"></div>
<span id="show_length" class="time"><?php echo $this->showLength; ?></span> <span id="show_length" class="time"><?php echo $this->showLength; ?></span>
</div> </div>
<div id="show_time_warning"></div> <div id="show_time_warning" style="display:none"></div>
</div> </div>
</div> </div>
</div> </div>

28
airtime_mvc/public/js/airtime/schedule/schedule.js
View File

@ -9,6 +9,22 @@ function closeDialog(event, ui) {
$(this).remove(); $(this).remove();
} }
function checkShowLength() {
var showFilled = $("#show_time_filled").text().split('.')[0];
var showLength = $("#show_length").text();
if (showFilled > showLength){
$("#show_time_warning")
.text("Shows longer than their scheduled time will be cut off by a following show.")
.show();
}
else {
$("#show_time_warning")
.empty()
.hide();
}
}
function setScheduleDialogHtml(json) { function setScheduleDialogHtml(json) {
var dt; var dt;
@ -23,14 +39,7 @@ function setScheduleDialogHtml(json) {
$("#show_time_filled").empty().append(json.timeFilled); $("#show_time_filled").empty().append(json.timeFilled);
$("#show_progressbar").progressbar( "value" , json.percentFilled ); $("#show_progressbar").progressbar( "value" , json.percentFilled );
var showFilled = $("#show_time_filled").text().split('.')[0]; checkShowLength();
var showLength = $("#show_length").text();
if (showFilled > showLength){
$("#show_time_warning").text("Shows longer than their scheduled time will be cut off by a following show.");
} else {
$("#show_time_warning").empty();
}
} }
function setScheduleDialogEvents(dialog) { function setScheduleDialogEvents(dialog) {
@ -221,7 +230,7 @@ function buildScheduleDialog(json){
autoOpen: false, autoOpen: false,
title: 'Schedule Playlist', title: 'Schedule Playlist',
width: 1100, width: 1100,
height: 500, height: 550,
modal: true, modal: true,
close: closeDialog, close: closeDialog,
buttons: {"Ok": function() { buttons: {"Ok": function() {
@ -231,6 +240,7 @@ function buildScheduleDialog(json){
}); });
dialog.dialog('open'); dialog.dialog('open');
checkShowLength();
} }
function buildEditDialog(json){ function buildEditDialog(json){

12
install/airtime-upgrade.php
View File

@ -7,11 +7,11 @@
*/ */
require_once(dirname(__FILE__).'/include/AirtimeIni.php'); require_once(dirname(__FILE__).'/include/AirtimeIni.php');
set_include_path(__DIR__.'/../library' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
require_once __DIR__.'/../application/configs/conf.php'; require_once __DIR__.'/../airtime_mvc/application/configs/conf.php';
require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
AirtimeIni::ExitIfNotRoot(); AirtimeInstall::ExitIfNotRoot();
AirtimeInstall::DbConnect(true); AirtimeInstall::DbConnect(true);
if(AirtimeInstall::DbTableExists('cc_show_rebroadcast') === true) { if(AirtimeInstall::DbTableExists('cc_show_rebroadcast') === true) {
@ -34,6 +34,12 @@ if(strcmp($version, "1.8.0") < 0) {
AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION); AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION);
echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
echo PHP_EOL."*** Updating Recorder ***".PHP_EOL;
system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py");
echo "******************************* Update Complete *******************************".PHP_EOL; echo "******************************* Update Complete *******************************".PHP_EOL;

4
install/upgrades/airtime-1.8/airtime-upgrade.php
View File

@ -6,8 +6,8 @@
* @license http://www.gnu.org/licenses/gpl.txt * @license http://www.gnu.org/licenses/gpl.txt
*/ */
set_include_path(__DIR__.'/../../../library' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path());
require_once __DIR__.'/../../../application/configs/conf.php'; require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php';
require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
AirtimeInstall::DbConnect(true); AirtimeInstall::DbConnect(true);

4
python_apps/pypo/scripts/liquidsoap.cfg
View File

@ -34,5 +34,5 @@ icecast_genre = "genre"
#liquidsoap output settings # #liquidsoap output settings #
########################################### ###########################################
output_sound_device = false output_sound_device = false
output_icecast_vorbis = false output_icecast_vorbis = true
output_icecast_mp3 = true output_icecast_mp3 = false