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

CC-2301 : changing more CRLF files

This commit is contained in:
Naomi 2013-04-29 18:11:11 -04:00
parent b2a490ac47
commit 2e03e1982f
2 changed files with 27 additions and 27 deletions
airtime_mvc/application
controllers
PlaylistController.php
models
Playlist.php

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

@ -418,31 +418,31 @@ class PlaylistController extends Zend_Controller_Action
} }
} }
public function setCrossFadeAction() public function setCrossFadeAction()
{ {
$id = $this->_getParam('id'); $id = $this->_getParam('id');
$fadeIn = $this->_getParam('fadeIn', 0); $fadeIn = $this->_getParam('fadeIn', 0);
$fadeOut = $this->_getParam('fadeOut', 0); $fadeOut = $this->_getParam('fadeOut', 0);
$type = $this->_getParam('type'); $type = $this->_getParam('type');
$offset = $this->_getParam('offset', 0); $offset = $this->_getParam('offset', 0);
try { try {
$obj = $this->getPlaylist($type); $obj = $this->getPlaylist($type);
$response = $obj->changeFadeInfo($id, $fadeIn, $fadeOut); $response = $obj->changeFadeInfo($id, $fadeIn, $fadeOut);
if (!isset($response["error"])) { if (!isset($response["error"])) {
$this->createUpdateResponse($obj); $this->createUpdateResponse($obj);
$this->view->response = $response; $this->view->response = $response;
} else { } else {
$this->view->fade_error = $response["error"]; $this->view->fade_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()

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

@ -655,10 +655,10 @@ SQL;
*/ */
public function createCrossfade($id1, $id2, $fadeIn, $fadeOut, $offset) public function createCrossfade($id1, $id2, $fadeIn, $fadeOut, $offset)
{ {
$this->con->beginTransaction(); $this->con->beginTransaction();
try { try {
$this->changeFadeInfo($id1, null, $fadeOut); $this->changeFadeInfo($id1, null, $fadeOut);
$this->changeFadeInfo($id2, $fadeIn, null); $this->changeFadeInfo($id2, $fadeIn, null);
$item = CcPlaylistcontentsQuery::create()->findPK($id2); $item = CcPlaylistcontentsQuery::create()->findPK($id2);