Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	htmlUI/templates/header.tpl
This commit is contained in:
naomiaro 2010-10-01 17:33:13 -04:00
commit 1e2cef160a
8 changed files with 86 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

12
htmlUI/ui_handler.php
View file

@ -19,9 +19,9 @@ switch ($_REQUEST['act']) {
# $uiHandler->PLAYLIST->reportLookedPL();
$uiHandler->PLAYLIST->loadLookedFromPref();
}
include('/templates/loader/index.tpl');
include('/templates/popup/_reload_parent.tpl');
include('/templates/popup/_close.tpl');
include(dirname(__FILE__).'/htmlUI/templates/loader/index.tpl');
include(dirname(__FILE__).'/htmlUI/templates/popup/_reload_parent.tpl');
include(dirname(__FILE__).'/htmlUI/templates/popup/_close.tpl');
exit;
case "logout":
@ -323,11 +323,11 @@ switch ($_REQUEST['act']) {
break;
case "PL.setClipLength":
$uiHandler->PLAYLIST->setClipLength($_REQUEST['pos'], $_REQUEST['cueIn'], $_REQUEST['cueOut']);
$uiHandler->PLAYLIST->setClipLength($_REQUEST['pos'], $_REQUEST['cueIn'], $_REQUEST['cueOut']);
break;
case "PL.setFadeLength":
$uiHandler->PLAYLIST->setFadeLength($_REQUEST['pos'], $_REQUEST['fadeIn'], $_REQUEST['fadeOut']);
$uiHandler->PLAYLIST->setFadeLength($_REQUEST['pos'], $_REQUEST['fadeIn'], $_REQUEST['fadeOut']);
break;
case "PL.removeItem":