Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences)

This commit is contained in:
Naomi Aro 2012-04-13 11:09:52 +02:00
parent 169a4827e4
commit ef908ee894
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
airtime_mvc/application/models/Preference.php
View File

@ -151,7 +151,14 @@ class Application_Model_Preference
}
public static function GetDefaultFade() {
return self::GetValue("default_fade");
$fade = self::GetValue("default_fade");
if ($fade === "") {
return null;
}
$fade = number_format($fade, 6);
return $fade;
}
public static function SetDefaultTransitionFade($fade) {

2
airtime_mvc/application/models/Scheduler.php
View File

@ -132,7 +132,7 @@ class Application_Model_Scheduler {
$data["cueout"] = $file->getDbLength();
$defaultFade = Application_Model_Preference::GetDefaultFade();
if ($defaultFade !== "") {
if (isset($defaultFade)) {
//fade is in format SS.uuuuuu
$data["fadein"] = $defaultFade;
$data["fadeout"] = $defaultFade;