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

Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x

Browse source
This commit is contained in:
James 2012-07-10 17:09:46 -04:00
commit f174a2bcf3
2 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
airtime_mvc/application/controllers/PlaylistController.php
View file

@ -83,7 +83,7 @@ class PlaylistController extends Zend_Controller_Action
} }
} }
private function playlistOutdated($pl, $e) private function playlistOutdated($e)
{ {
$this->view->error = $e->getMessage(); $this->view->error = $e->getMessage();
} }
@ -244,7 +244,7 @@ class PlaylistController extends Zend_Controller_Action
$this->createUpdateResponse($pl); $this->createUpdateResponse($pl);
} }
catch (PlaylistOutDatedException $e) { catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e); $this->playlistOutdated($e);
} }
catch (PlaylistNotFoundException $e) { catch (PlaylistNotFoundException $e) {
$this->playlistNotFound(); $this->playlistNotFound();
@ -267,7 +267,7 @@ class PlaylistController extends Zend_Controller_Action
$this->createUpdateResponse($pl); $this->createUpdateResponse($pl);
} }
catch (PlaylistOutDatedException $e) { catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e); $this->playlistOutdated($e);
} }
catch (PlaylistNotFoundException $e) { catch (PlaylistNotFoundException $e) {
$this->playlistNotFound(); $this->playlistNotFound();
@ -289,7 +289,7 @@ class PlaylistController extends Zend_Controller_Action
$this->createUpdateResponse($pl); $this->createUpdateResponse($pl);
} }
catch (PlaylistOutDatedException $e) { catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e); $this->playlistOutdated($e);
} }
catch (PlaylistNotFoundException $e) { catch (PlaylistNotFoundException $e) {
$this->playlistNotFound(); $this->playlistNotFound();
@ -318,7 +318,7 @@ class PlaylistController extends Zend_Controller_Action
} }
} }
catch (PlaylistOutDatedException $e) { catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e); $this->playlistOutdated($e);
} }
catch (PlaylistNotFoundException $e) { catch (PlaylistNotFoundException $e) {
$this->playlistNotFound(); $this->playlistNotFound();
@ -347,7 +347,7 @@ class PlaylistController extends Zend_Controller_Action
} }
} }
catch (PlaylistOutDatedException $e) { catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e); $this->playlistOutdated($e);
} }
catch (PlaylistNotFoundException $e) { catch (PlaylistNotFoundException $e) {
$this->playlistNotFound(); $this->playlistNotFound();
@ -368,7 +368,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->fadeOut = $fades[1]; $this->view->fadeOut = $fades[1];
} }
catch (PlaylistOutDatedException $e) { catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e); $this->playlistOutdated($e);
} }
catch (PlaylistNotFoundException $e) { catch (PlaylistNotFoundException $e) {
$this->playlistNotFound(); $this->playlistNotFound();
@ -394,7 +394,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->modified = $pl->getLastModified("U"); $this->view->modified = $pl->getLastModified("U");
} }
catch (PlaylistOutDatedException $e) { catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e); $this->playlistOutdated($e);
} }
catch (PlaylistNotFoundException $e) { catch (PlaylistNotFoundException $e) {
$this->playlistNotFound(); $this->playlistNotFound();
@ -415,7 +415,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->modified = $pl->getLastModified("U"); $this->view->modified = $pl->getLastModified("U");
} }
catch (PlaylistOutDatedException $e) { catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e); $this->playlistOutdated($e);
} }
catch (PlaylistNotFoundException $e) { catch (PlaylistNotFoundException $e) {
$this->playlistNotFound(); $this->playlistNotFound();
@ -436,7 +436,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->modified = $pl->getLastModified("U"); $this->view->modified = $pl->getLastModified("U");
} }
catch (PlaylistOutDatedException $e) { catch (PlaylistOutDatedException $e) {
$this->playlistOutdated($pl, $e); $this->playlistOutdated($e);
} }
catch (PlaylistNotFoundException $e) { catch (PlaylistNotFoundException $e) {
$this->playlistNotFound(); $this->playlistNotFound();

10
airtime_mvc/application/models/Playlist.php
View file

@ -462,10 +462,12 @@ class Application_Model_Playlist {
->filterByDbPosition($pos) ->filterByDbPosition($pos)
->findOne(); ->findOne();
#Propel returns values in form 00.000000 format which is for only seconds.
$fadeIn = $row->getDbFadein();
$fadeOut = $row->getDbFadeout(); #Propel returns values in form 00.000000 format which is for only seconds.
return array($fadeIn, $fadeOut); $fadeIn = $row->getDbFadein();
$fadeOut = $row->getDbFadeout();
return array($fadeIn, $fadeOut);
} }
/** /**