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

Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

Browse source
This commit is contained in:
denise 2012-10-22 16:37:19 -04:00
commit 9ddd54ec12
5 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1792,7 +1792,7 @@ SQL;
$show["instance_id"]); $show["instance_id"]);
$options["show_empty"] = (array_key_exists($show['instance_id'], $options["show_empty"] = (array_key_exists($show['instance_id'],
$content_count)) ? 1 : 0; $content_count)) ? 0 : 1;
$events[] = &self::makeFullCalendarEvent($show, $options, $events[] = &self::makeFullCalendarEvent($show, $options,
$startsDT, $endsDT, $startsEpochStr, $endsEpochStr); $startsDT, $endsDT, $startsEpochStr, $endsEpochStr);

6
airtime_mvc/application/models/ShowInstance.php
View file

@ -679,7 +679,11 @@ SQL;
':p_end' => $p_end->format("Y-m-d G:i:s")) ':p_end' => $p_end->format("Y-m-d G:i:s"))
, 'all'); , 'all');
return $counts; $real_counts = array();
foreach ($counts as $c) {
$real_counts[$c['instance_id']] = $c['instance_count'];
}
return $real_counts;
} }

6
install_minimal/upgrades/airtime-2.2.0/data/upgrade.sql
View file

@ -140,6 +140,12 @@ ALTER TABLE cc_playlistcontents
ALTER TABLE cc_schedule ALTER TABLE cc_schedule
ADD COLUMN stream_id integer; ADD COLUMN stream_id integer;
CREATE INDEX cc_schedule_instance_id_idx
ON cc_schedule
USING btree
(instance_id);
ALTER TABLE cc_subjs ALTER TABLE cc_subjs
ADD COLUMN cell_phone character varying(255); ADD COLUMN cell_phone character varying(255);

2
python_apps/pypo/liquidsoap_scripts/ls_lib.liq
View file

@ -27,7 +27,7 @@ def append_title(m) =
end end
end end
def crossfade(s) def crossfade_airtime(s)
#duration is automatically overwritten by metadata fields passed in #duration is automatically overwritten by metadata fields passed in
#with audio #with audio
s = fade.in(type="log", duration=0., s) s = fade.in(type="log", duration=0., s)

4
python_apps/pypo/liquidsoap_scripts/ls_script.liq
View file

@ -44,9 +44,9 @@ web_stream = on_metadata(notify_stream, web_stream)
output.dummy(fallible=true, web_stream) output.dummy(fallible=true, web_stream)
queue = on_metadata(notify, queue) queue = on_metadata(notify, queue)
queue = map_metadata(update=false, append_title, queue) queue = map_metadata(update=true, append_title, queue)
# the crossfade function controls fade in/out # the crossfade function controls fade in/out
queue = crossfade(queue) queue = crossfade_airtime(queue)
output.dummy(fallible=true, queue) output.dummy(fallible=true, queue)