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

CC-1665: Scheduled stream rebroadcasting and recording

Browse source 
-send stream name back to Airtime: [("url","http://idobiradio.com/"), ("title","Good Charlotte - Like It's Her Birthday")]
This commit is contained in:
Martin Konecny 2012-08-15 15:12:44 -04:00
parent 899c94eb67
commit d773dcd112
13 changed files with 206 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/models/Schedule.php
View file

@ -80,12 +80,10 @@ class Application_Model_Schedule
%%tables%% WHERE ";
$fileColumns = "ft.artist_name, ft.track_title, ";
//$fileJoin = "cc_files ft ON st.file_id = ft.id";
$fileJoin = "FROM cc_schedule st JOIN cc_files ft ON st.file_id = ft.id
LEFT JOIN cc_show_instances si ON st.instance_id = si.id";
$streamColumns = "sub.login as artist_name, ws.name as track_title, ";
//$streamJoin = "cc_webstream ws ON st.stream_id = ws.id";
$streamColumns = "ws.name as artist_name, ws.liquidsoap_data as track_title, ";
$streamJoin = "FROM cc_schedule st JOIN cc_webstream ws ON st.stream_id = ws.id
LEFT JOIN cc_show_instances si ON st.instance_id = si.id
LEFT JOIN cc_subjs as sub on sub.id = ws.creator_id";