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

Merge branch 'devel' into 2.3.x-saas

Browse source 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
This commit is contained in:
Martin Konecny 2013-01-18 17:38:48 -05:00
commit 909e290bd3
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -378,6 +378,8 @@ SQL;
$row->setDbCliplength($info["cliplength"]);
$row->setDbCuein($info["cuein"]);
$row->setDbCueout($info["cueout"]);
$info["fadein"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]);
$info["fadeout"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]);
$row->setDbFadein($info["fadein"]);
$row->setDbFadeout($info["fadeout"]);
$row->save($this->con);

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

@ -348,6 +348,8 @@ SQL;
$row->setDbCliplength($info["cliplength"]);
$row->setDbCuein($info["cuein"]);
$row->setDbCueout($info["cueout"]);
$info["fadein"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]);
$info["fadeout"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]);
$row->setDbFadein($info["fadein"]);
$row->setDbFadeout($info["fadeout"]);
if ($info["ftype"] == "audioclip") {