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

CC-2301 : CRLF fix.

This commit is contained in:
Naomi 2013-04-30 15:34:20 -04:00
parent 0db557a570
commit 2462e4f144
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
airtime_mvc/application/models/Block.php
View File

@ -670,27 +670,27 @@ SQL;
return array($fadeIn, $fadeOut); return array($fadeIn, $fadeOut);
} }
/* /*
* create a crossfade from item in cc_playlist_contents with $id1 to item $id2. * create a crossfade from item in cc_playlist_contents with $id1 to item $id2.
* *
* $fadeOut length of fade out in seconds if $id1 * $fadeOut length of fade out in seconds if $id1
* $fadeIn length of fade in in seconds of $id2 * $fadeIn length of fade in in seconds of $id2
* $offset time in seconds from end of $id1 that $id2 will begin to play. * $offset time in seconds from end of $id1 that $id2 will begin to play.
*/ */
public function createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset) public function createCrossfade($id1, $fadeOut, $id2, $fadeIn, $offset)
{ {
$this->con->beginTransaction(); $this->con->beginTransaction();
try { try {
$this->changeFadeInfo($id1, null, $fadeOut); $this->changeFadeInfo($id1, null, $fadeOut);
$this->changeFadeInfo($id2, $fadeIn, null, $offset); $this->changeFadeInfo($id2, $fadeIn, null, $offset);
$this->con->commit(); $this->con->commit();
} catch (Exception $e) { } catch (Exception $e) {
$this->con->rollback(); $this->con->rollback();
throw $e; throw $e;
} }
} }
/** /**
@ -738,10 +738,10 @@ SQL;
} }
$row->setDbFadein($fadeIn); $row->setDbFadein($fadeIn);
if (!is_null($offset)) { if (!is_null($offset)) {
$row->setDbTrackOffset($offset); $row->setDbTrackOffset($offset);
Logging::info("Setting offset {$offset} on item {$id}"); Logging::info("Setting offset {$offset} on item {$id}");
$row->save($this->con); $row->save($this->con);
} }
} }