Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-10 16:43:35 +02:00
Code Issues Projects Releases Wiki Activity

resolved conflict in ChangeLog

Browse Source
This commit is contained in:
Fred Gleason
2016-04-26 17:00:11 -04:00
parent c3a5ac7f3e 43f7bb297a
commit 7f441e628b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -15098,3 +15098,6 @@
saving and updating logs. (from albanpeigner pull request #42)
* Created modification pointer in voicetracker for better performance
over WAN networks
2016-04-26 Brian McGlynn <brian.mcglynn@geneseemedia.net>
* Updated Cart Scheduler to favor weighted playback for cuts expiring
first following the number of plays

3
lib/rdcart.cpp
View File

@@ -129,7 +129,8 @@ bool RDCart::selectCut(QString *cut,const QTime &time) const
QString().sprintf("(CART_NUMBER=%u)&&(EVERGREEN=\"N\")&&",cart_number)+
"(LENGTH>0)";
if(useWeighting()) {
sql+=" order by LOCAL_COUNTER";
sql+=" order by LOCAL_COUNTER ASC, ISNULL(END_DATETIME), END_DATETIME ASC, \
LAST_PLAY_DATETIME ASC";
}
else {
sql+=" order by LAST_PLAY_DATETIME desc";