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

-small fix to allow overlapping of scheduled items.

This commit is contained in:
martin 2011-03-06 16:57:42 -05:00
parent 9aec669104
commit 6c70e4994f
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/models/Schedule.php
View File

@ -128,9 +128,6 @@ class ScheduleGroup {
if (empty($length)) { if (empty($length)) {
return new PEAR_Error("Length is empty."); 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 // Insert all items into the schedule
$this->groupId = $CC_DBC->GetOne("SELECT nextval('schedule_group_id_seq')"); $this->groupId = $CC_DBC->GetOne("SELECT nextval('schedule_group_id_seq')");

6
pypo/scripts/lib.liq
View File

@ -17,8 +17,10 @@ def append_title(m) =
end end
def crossfade(s) def crossfade(s)
s = fade.in(type="log", s) #duration is automatically overwritten by metadata fields passed in
s = fade.out(type="log", s) #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]) fader = fun (a,b) -> add(normalize=false,[b,a])
cross(fader,s) cross(fader,s)
end end