Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-27 22:19:25 +02:00
Code Issues Projects Releases Wiki Activity

2016-06-17 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in 'lib/rdcut.cpp' that caused a SQL error when
	generating an XML 'cutList' object.
This commit is contained in:
Fred Gleason 2016-06-17 10:39:30 -04:00
parent d48935a00a
commit 605dfbb964
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -15243,3 +15243,6 @@
2016-06-15 Fred Gleason <fredg@paravelsystems.com> 2016-06-15 Fred Gleason <fredg@paravelsystems.com>
* Added an '--xml' switch to rdexport(1) in * Added an '--xml' switch to rdexport(1) in
'utils/rdexport/rdexport.cpp' and 'utils/rdexport/rdexport.h'. 'utils/rdexport/rdexport.cpp' and 'utils/rdexport/rdexport.h'.
2016-06-17 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'lib/rdcut.cpp' that caused a SQL error when
generating an XML 'cutList' object.

54
lib/rdcut.cpp
View File

@ -1131,18 +1131,48 @@ QString RDCut::xml() const
RDSqlQuery *q; RDSqlQuery *q;
QString ret=""; QString ret="";
sql=QString().sprintf("select EVERGREEN,DESCRIPTION,OUTCUE,ISRC,ISCI,\ sql=QString("select ")+
LENGTH,ORIGIN_DATETIME,START_DATETIME,END_DATETIME,\ "EVERGREEN,"+ // 00
SUN,MON,TUE,WED,THU,FRI,SAT,START_DAYPART,END_DAYPART,\ "DESCRIPTION,"+ // 01
ORIGIN_NAME,WEIGHT,LAST_PLAY_DATETIME,\ "OUTCUE,"+ // 02
PLAY_COUNTER,LOCAL_COUNTER,VALIDITY,CODING_FORMAT,\ "ISRC,"+ // 03
SAMPLE_RATE,BIT_RATE,CHANNELS,PLAY_GAIN,START_POINT,\ "ISCI,"+ // 04
END_POINT,FADEUP_POINT,FADEDOWN_POINT,\ "LENGTH,"+ // 05
SEGUE_START_POINT,SEGUE_END_POINT,SEGUE_GAIN\ "ORIGIN_DATETIME,"+ // 06
HOOK_START_POINT,HOOK_END_POINT,\ "START_DATETIME,"+ // 07
TALK_START_POINT,TALK_END_POINT \ "END_DATETIME,"+ // 08
from CUTS where CUT_NAME=\"%s\"", "SUN,"+ // 09
(const char *)cut_name); "MON,"+ // 10
"TUE,"+ // 11
"WED,"+ // 12
"THU,"+ // 13
"FRI,"+ // 14
"SAT,"+ // 15
"START_DAYPART,"+ // 16
"END_DAYPART,"+ // 17
"ORIGIN_NAME,"+ // 18
"WEIGHT,"+ // 19
"LAST_PLAY_DATETIME,"+ // 20
"PLAY_COUNTER,"+ // 21
"LOCAL_COUNTER,"+ // 22
"VALIDITY,"+ // 23
"CODING_FORMAT,"+ // 24
"SAMPLE_RATE,"+ // 25
"BIT_RATE,"+ // 26
"CHANNELS,"+ // 27
"PLAY_GAIN,"+ // 28
"START_POINT,"+ // 29
"END_POINT,"+ // 30
"FADEUP_POINT,"+ // 31
"FADEDOWN_POINT,"+ // 32
"SEGUE_START_POINT,"+ // 33
"SEGUE_END_POINT,"+ // 34
"SEGUE_GAIN,"+ // 35
"HOOK_START_POINT,"+ // 36
"HOOK_END_POINT,"+ // 37
"TALK_START_POINT,"+ // 38
"TALK_END_POINT "+ // 39
"from CUTS where CUT_NAME=\""+cut_name+"\"";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
ret+="<cut>\n"; ret+="<cut>\n";