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

-added listen to icecast stream through browser option. Fixed various bugs in now playing screen. added fade support to liquidsoap script

Browse source
This commit is contained in:
martin 2011-01-26 17:08:30 -05:00
parent a2a8a8eae3
commit 5b11025b31
9 changed files with 181 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

34
application/models/Schedule.php
View file

@ -481,11 +481,12 @@ class Schedule {
global $CC_CONFIG, $CC_DBC;
$sql = "SELECT pt.name, ft.track_title, ft.artist_name, ft.album_title, st.starts, st.ends, st.clip_length, sdt.start_time, sdt.end_time"
." FROM $CC_CONFIG[scheduleTable] st, $CC_CONFIG[filesTable] ft, $CC_CONFIG[playListTable] pt, $CC_CONFIG[showSchedule] sst, $CC_CONFIG[showDays] sdt"
." WHERE (st.ends < TIMESTAMP '$timeNow')"
." AND (st.playlist_id = pt.id)"
." AND (st.file_id = ft.id)"
." AND (st.group_id = sst.group_id)"
." AND (sdt.show_id = sst.show_id)"
." WHERE st.ends < TIMESTAMP '$timeNow'"
." AND st.ends > (TIMESTAMP '$timeNow' - INTERVAL '1 days')"
." AND st.playlist_id = pt.id"
." AND st.file_id = ft.id"
." AND st.group_id = sst.group_id"
." AND sdt.show_id = sst.show_id"
." ORDER BY st.starts DESC"
." LIMIT $prevCount";
$rows = $CC_DBC->GetAll($sql);
@ -498,12 +499,12 @@ class Schedule {
$sql = "SELECT pt.name, ft.track_title, ft.artist_name, ft.album_title, st.starts, st.ends, st.clip_length, sdt.start_time, sdt.end_time"
." FROM $CC_CONFIG[scheduleTable] st,"
."$CC_CONFIG[filesTable] ft, $CC_CONFIG[playListTable] pt, $CC_CONFIG[showSchedule] sst, $CC_CONFIG[showDays] sdt"
." WHERE (st.starts < TIMESTAMP '$timeNow')"
." AND (st.ends > TIMESTAMP '$timeNow')"
." AND (st.playlist_id = pt.id)"
." AND (st.file_id = ft.id)"
." AND (st.group_id = sst.group_id)"
." AND (sdt.show_id = sst.show_id)";
." WHERE st.starts < TIMESTAMP '$timeNow'"
." AND st.ends > TIMESTAMP '$timeNow'"
." AND st.playlist_id = pt.id"
." AND st.file_id = ft.id"
." AND st.group_id = sst.group_id"
." AND sdt.show_id = sst.show_id";
$rows = $CC_DBC->GetAll($sql);
return $rows;
}
@ -512,11 +513,12 @@ class Schedule {
global $CC_CONFIG, $CC_DBC;
$sql = "SELECT pt.name, ft.track_title, ft.artist_name, ft.album_title, st.starts, st.ends, st.clip_length, sdt.start_time, sdt.end_time"
." FROM $CC_CONFIG[scheduleTable] st, $CC_CONFIG[filesTable] ft, $CC_CONFIG[playListTable] pt, $CC_CONFIG[showSchedule] sst, $CC_CONFIG[showDays] sdt"
." WHERE (st.starts > TIMESTAMP '$timeNow')"
." AND (st.playlist_id = pt.id)"
." AND (st.file_id = ft.id)"
." AND (st.group_id = sst.group_id)"
." AND (sdt.show_id = sst.show_id)"
." WHERE st.starts > TIMESTAMP '$timeNow'"
." AND st.ends < (TIMESTAMP '$timeNow' + INTERVAL '24 hours')"
." AND st.playlist_id = pt.id"
." AND st.file_id = ft.id"
." AND st.group_id = sst.group_id"
." AND sdt.show_id = sst.show_id"
." ORDER BY st.starts"
." LIMIT $nextCount";
$rows = $CC_DBC->GetAll($sql);