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

CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences

Browse source 
- didn't change much fixed two bugs and changed formating.
- I introduced a but in Playlist.changeFadeInfo because for the general playlist fade in and out I didn't realize that these values are being set to the first and last elements. So I added a guard.
- I also updated the logic for Playlist.moveAudioClip so if new and old position are the same we just return
This commit is contained in:
Daniel 2012-02-03 18:19:13 -05:00
parent 7317b1d5af
commit d6bf95500c
2 changed files with 58 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -163,23 +163,24 @@ class PlaylistController extends Zend_Controller_Action
public function moveItemAction() public function moveItemAction()
{ {
$oldPos = $this->_getParam('oldPos'); $oldPos = $this->_getParam('oldPos');
$newPos = $this->_getParam('newPos'); $newPos = $this->_getParam('newPos');
$pl = $this->getPlaylist();
$pl = $this->getPlaylist();
if($pl === false){ if($pl === false){
$this->view->playlist_error = true; $this->view->playlist_error = true;
return false; return false;
} }
$pl->moveAudioClip($oldPos, $newPos); $pl->moveAudioClip($oldPos, $newPos);
$this->view->pl = $pl; $this->view->pl = $pl;
$this->view->html = $this->view->render('playlist/update.phtml'); $this->view->html = $this->view->render('playlist/update.phtml');
$this->view->name = $pl->getName(); $this->view->name = $pl->getName();
$this->view->length = $pl->getLength(); $this->view->length = $pl->getLength();
$this->view->description = $pl->getDescription(); $this->view->description = $pl->getDescription();
unset($this->view->pl); unset($this->view->pl);
} }
public function deleteItemAction() public function deleteItemAction()
@ -294,19 +295,19 @@ class PlaylistController extends Zend_Controller_Action
public function setFadeAction() public function setFadeAction()
{ {
$pos = $this->_getParam('pos'); $pos = $this->_getParam('pos');
$pl = $this->getPlaylist(); $pl = $this->getPlaylist();
if($pl === false){ if($pl === false){
$this->view->playlist_error = true; $this->view->playlist_error = true;
return false; return false;
} }
$fadeIn = $this->_getParam('fadeIn', null); $fadeIn = $this->_getParam('fadeIn', null);
$fadeOut = $this->_getParam('fadeOut', null); $fadeOut = $this->_getParam('fadeOut', null);
$response = $pl->changeFadeInfo($pos, $fadeIn, $fadeOut); $response = $pl->changeFadeInfo($pos, $fadeIn, $fadeOut);
$this->view->response = $response;
$this->view->response = $response;
if(!isset($response["error"])) { if(!isset($response["error"])) {
$this->view->pl = $pl; $this->view->pl = $pl;
@ -369,33 +370,39 @@ class PlaylistController extends Zend_Controller_Action
$this->view->html = $this->view->render('playlist/index.phtml'); $this->view->html = $this->view->render('playlist/index.phtml');
} }
/**
* The playlist fades are stored in the elements themselves.
* The fade in is set to the first elements fade in and
* the fade out is set to the last elments fade out.
**/
public function setPlaylistFadesAction() public function setPlaylistFadesAction()
{ {
$request = $this->getRequest(); $request = $this->getRequest();
$pl = $this->getPlaylist(); $pl = $this->getPlaylist();
if($pl === false){ if($pl === false){
$this->view->playlist_error = true; $this->view->playlist_error = true;
return false; return false;
} }
if($request->isPost()) { if($request->isPost()) {
$fadeIn = $this->_getParam('fadeIn', null); $fadeIn = $this->_getParam('fadeIn', null);
$fadeOut = $this->_getParam('fadeOut', null); $fadeOut = $this->_getParam('fadeOut', null);
if($fadeIn) if($fadeIn)
$response = $pl->changeFadeInfo(0, $fadeIn, $fadeOut); $response = $pl->changeFadeInfo(0, $fadeIn, $fadeOut);
else if($fadeOut) else if($fadeOut)
$response = $pl->changeFadeInfo($pl->getSize(), $fadeIn, $fadeOut); $response = $pl->changeFadeInfo($pl->getSize(), $fadeIn, $fadeOut);
$this->view->response = $response; $this->view->response = $response;
return;
}
$fades = $pl->getFadeInfo(0); return;
$this->view->fadeIn = $fades[0]; }
$fades = $pl->getFadeInfo($pl->getSize()); $fades = $pl->getFadeInfo(0);
$this->view->fadeOut = $fades[1]; $this->view->fadeIn = $fades[0];
$fades = $pl->getFadeInfo($pl->getSize());
$this->view->fadeOut = $fades[1];
} }
public function setPlaylistNameAction() public function setPlaylistNameAction()

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

@ -219,7 +219,6 @@ class Application_Model_Playlist {
if($pl === NULL) if($pl === NULL)
return FALSE; return FALSE;
$pl->setDbDescription($p_description); $pl->setDbDescription($p_description);
$pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC")); $pl->setDbMtime(new DateTime("now"), new DateTimeZone("UTC"));
$pl->save(); $pl->save();
@ -428,18 +427,20 @@ class Application_Model_Playlist {
* will normalize the fade so that it looks like 00.000000 to the user. * will normalize the fade so that it looks like 00.000000 to the user.
**/ **/
public function normalizeFade($fade) { public function normalizeFade($fade) {
//First get rid of the first six characters 00:00: which will be added back later for db update
$fade = substr($fade, 6);
//Second add .000000 if the fade does't have milliseconds format already //First get rid of the first six characters 00:00: which will be added back later for db update
$dbFadeStrPos = strpos( $fade, '.' ); $fade = substr($fade, 6);
if ( $dbFadeStrPos === False )
$fade .= '.000000'; //Second add .000000 if the fade does't have milliseconds format already
else $dbFadeStrPos = strpos( $fade, '.' );
while( strlen( $fade ) < 9 ) if ( $dbFadeStrPos === False )
$fade .= '0'; $fade .= '.000000';
//done, just need to set back the formated values else
return $fade; while( strlen( $fade ) < 9 )
$fade .= '0';
//done, just need to set back the formated values
return $fade;
} }
public function getLength() { public function getLength() {
@ -610,7 +611,7 @@ class Application_Model_Playlist {
*/ */
public function moveAudioClip($oldPos, $newPos) public function moveAudioClip($oldPos, $newPos)
{ {
if($newPos < 0 || $newPos >= $this->getNextPos() || $oldPos < 0 || $oldPos >= $this->getNextPos()) if($newPos < 0 || $newPos >= $this->getNextPos() || $oldPos < 0 || $oldPos >= $this->getNextPos() || $oldPos === $newPos)
return FALSE; return FALSE;
$row = $this->delAudioClip($oldPos); $row = $this->delAudioClip($oldPos);
@ -630,21 +631,17 @@ class Application_Model_Playlist {
public function getFadeInfo($pos) { public function getFadeInfo($pos) {
$row = CcPlaylistcontentsQuery::create() $row = CcPlaylistcontentsQuery::create()
->joinWith(CcFilesPeer::OM_CLASS) ->joinWith(CcFilesPeer::OM_CLASS)
->filterByDbPlaylistId($this->id) ->filterByDbPlaylistId($this->id)
->filterByDbPosition($pos) ->filterByDbPosition($pos)
->findOne(); ->findOne();
$fadeIn = $row->getDbFadein();
$fadeOut = $row->getDbFadeout();
#For issue CC-2065, fade in and out values are for the Playlist itself and must be #For issue CC-2065, fade in and out values are for the Playlist itself and must be
#modified from the db default format of 00:00:00 to the more practical #modified from the db default format of 00:00:00 to the more practical
#00.000000 format which is for only seconds. #00.000000 format which is for only seconds.
$fadeIn = $this->normalizeFade($fadeIn); $fadeIn = $this->normalizeFade($row->getDbFadein());
$fadeOut = $this->normalizeFade($fadeOut); $fadeOut = $this->normalizeFade($row->getDbFadeout());
return array($fadeIn, $fadeOut); return array($fadeIn, $fadeOut);
} }
@ -661,9 +658,11 @@ class Application_Model_Playlist {
*/ */
public function changeFadeInfo($pos, $fadeIn, $fadeOut) public function changeFadeInfo($pos, $fadeIn, $fadeOut)
{ {
#See issue CC-2065, pad the fadeIn and fadeOut so that it is TIME compatable with the DB schema //See issue CC-2065, pad the fadeIn and fadeOut so that it is TIME compatable with the DB schema
$fadeIn = '00:00:'.$fadeIn; //For the top level PlayList either fadeIn or fadeOut will sometimes be Null so need a gaurd against
$fadeOut = '00:00:'.$fadeOut; //setting it to nonNull for checks down below
$fadeIn = $fadeIn?'00:00:'.$fadeIn:$fadeIn;
$fadeOut = $fadeOut?'00:00:'.$fadeOut:$fadeOut;
$errArray= array(); $errArray= array();
$con = Propel::getConnection(CcPlaylistPeer::DATABASE_NAME); $con = Propel::getConnection(CcPlaylistPeer::DATABASE_NAME);