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

CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block

Browse source
This commit is contained in:
Naomi 2013-05-13 18:21:24 -04:00
parent 298e5a9b77
commit d9b6a15fb6
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/models/Block.php
View file

@ -688,8 +688,12 @@ SQL;
$this->con->beginTransaction();
try {
$this->changeFadeInfo($id1, null, $fadeOut);
$this->changeFadeInfo($id2, $fadeIn, null, $offset);
if (isset($id1)) {
$this->changeFadeInfo($id1, null, $fadeOut);
}
if (isset($id2)) {
$this->changeFadeInfo($id2, $fadeIn, null, $offset);
}
$this->con->commit();

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

@ -670,8 +670,12 @@ SQL;
$this->con->beginTransaction();
try {
$this->changeFadeInfo($id1, null, $fadeOut);
$this->changeFadeInfo($id2, $fadeIn, null, $offset);
if (isset($id1)) {
$this->changeFadeInfo($id1, null, $fadeOut);
}
if (isset($id2)) {
$this->changeFadeInfo($id2, $fadeIn, null, $offset);
}
$this->con->commit();