diff --git a/application/models/Schedule.php b/application/models/Schedule.php index ad8d24d3a..e50c09012 100644 --- a/application/models/Schedule.php +++ b/application/models/Schedule.php @@ -128,9 +128,6 @@ class ScheduleGroup { if (empty($length)) { return new PEAR_Error("Length is empty."); } - if (!Schedule::isScheduleEmptyInRange($p_datetime, $length)) { - return new PEAR_Error("Schedule conflict.", 555); - } // Insert all items into the schedule $this->groupId = $CC_DBC->GetOne("SELECT nextval('schedule_group_id_seq')"); diff --git a/pypo/scripts/lib.liq b/pypo/scripts/lib.liq index 2dc107c14..4e60d48cc 100644 --- a/pypo/scripts/lib.liq +++ b/pypo/scripts/lib.liq @@ -17,8 +17,10 @@ def append_title(m) = end def crossfade(s) - s = fade.in(type="log", s) - s = fade.out(type="log", s) + #duration is automatically overwritten by metadata fields passed in + #with audio + s = fade.in(type="log", duration=0., s) + s = fade.out(type="log", duration=0., s) fader = fun (a,b) -> add(normalize=false,[b,a]) cross(fader,s) end