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

Changed tabs to spaces

This commit is contained in:
Duncan Sommerville 2014-11-07 12:05:29 -05:00
parent 4dab2abf4e
commit f6bf2f8cc5
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
airtime_mvc/application/controllers/PlaylistController.php
View File

@ -38,7 +38,7 @@ class PlaylistController extends Zend_Controller_Action
$obj = null; $obj = null;
$objInfo = Application_Model_Library::getObjInfo($p_type); $objInfo = Application_Model_Library::getObjInfo($p_type);
$obj_sess = new Zend_Session_Namespace( UI_PLAYLISTCONTROLLER_OBJ_SESSNAME); $obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
if (isset($obj_sess->id)) { if (isset($obj_sess->id)) {
$obj = new $objInfo['className']($obj_sess->id); $obj = new $objInfo['className']($obj_sess->id);
@ -422,29 +422,29 @@ class PlaylistController extends Zend_Controller_Action
public function setCrossfadeAction() public function setCrossfadeAction()
{ {
$id1 = $this->_getParam('id1', null); $id1 = $this->_getParam('id1', null);
$id2 = $this->_getParam('id2', null); $id2 = $this->_getParam('id2', null);
$type = $this->_getParam('type'); $type = $this->_getParam('type');
$fadeIn = $this->_getParam('fadeIn', 0); $fadeIn = $this->_getParam('fadeIn', 0);
$fadeOut = $this->_getParam('fadeOut', 0); $fadeOut = $this->_getParam('fadeOut', 0);
$offset = $this->_getParam('offset', 0); $offset = $this->_getParam('offset', 0);
try { try {
$obj = $this->getPlaylist($type); $obj = $this->getPlaylist($type);
$response = $obj->createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset); $response = $obj->createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset);
if (!isset($response["error"])) { if (!isset($response["error"])) {
$this->createUpdateResponse($obj); $this->createUpdateResponse($obj);
} else { } else {
$this->view->error = $response["error"]; $this->view->error = $response["error"];
} }
} catch (PlaylistOutDatedException $e) { } catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($e); $this->playlistOutdated($e);
} catch (PlaylistNotFoundException $e) { } catch (PlaylistNotFoundException $e) {
$this->playlistNotFound($type); $this->playlistNotFound($type);
} catch (Exception $e) { } catch (Exception $e) {
$this->playlistUnknownError($e); $this->playlistUnknownError($e);
} }
} }
public function getPlaylistFadesAction() public function getPlaylistFadesAction()