Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-13 15:17:44 +02:00
Code Issues Projects Releases Wiki Activity

2017-12-22 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed bugs that caused creation of a new database to fail.
This commit is contained in:
Fred Gleason 2017-12-22 12:33:20 -05:00
parent 5525490f71
commit 1771d40d52
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16515,3 +16515,5 @@
2017-12-21 Fred Gleason <fredg@paravelsystems.com> 2017-12-21 Fred Gleason <fredg@paravelsystems.com>
* Updated 'NEWS'. * Updated 'NEWS'.
* Incremented the package version to 2.18.0. * Incremented the package version to 2.18.0.
2017-12-22 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs that caused creation of a new database to fail.

9
rdadmin/createdb.cpp
View File

@ -771,7 +771,7 @@ bool CreateDb(QString name,QString pwd,RDConfig *config)
"DEFAULT_TRIM_STATE enum('N','Y') default 'N',"+ "DEFAULT_TRIM_STATE enum('N','Y') default 'N',"+
"MAXLENGTH int,"+ "MAXLENGTH int,"+
"TAIL_PREROLL int unsigned default 1500,"+ "TAIL_PREROLL int unsigned default 1500,"+
"RIPPER_DEVICE char(64) default "+"/dev/cdrom"+","+ "RIPPER_DEVICE char(64) default \"/dev/cdrom\","+
"PARANOIA_LEVEL int default 0,"+ "PARANOIA_LEVEL int default 0,"+
"RIPPER_LEVEL int default -1300,"+ "RIPPER_LEVEL int default -1300,"+
"CDDB_SERVER char(64) default \"freedb.freedb.org\","+ "CDDB_SERVER char(64) default \"freedb.freedb.org\","+
@ -1071,7 +1071,7 @@ bool CreateDb(QString name,QString pwd,RDConfig *config)
"BAR_ACTION int unsigned default 0,"+ "BAR_ACTION int unsigned default 0,"+
"FLASH_PANEL enum('N','Y') default 'N',"+ "FLASH_PANEL enum('N','Y') default 'N',"+
"PANEL_PAUSE_ENABLED enum('N','Y') default 'N',"+ "PANEL_PAUSE_ENABLED enum('N','Y') default 'N',"+
"BUTTON_LABEL_TEMPLATE char(32) default "+"%t"+","+ "BUTTON_LABEL_TEMPLATE char(32) default '%t',"+
"PAUSE_ENABLED enum('N','Y'),"+ "PAUSE_ENABLED enum('N','Y'),"+
"DEFAULT_SERVICE char(10),"+ "DEFAULT_SERVICE char(10),"+
"HOUR_SELECTOR_ENABLED enum('N','Y') default 'N',"+ "HOUR_SELECTOR_ENABLED enum('N','Y') default 'N',"+
@ -2417,7 +2417,6 @@ bool InitDb(QString name,QString pwd,QString station_name,RDConfig *config)
sql=QString("insert into CUTS set ")+ sql=QString("insert into CUTS set ")+
"CUT_NAME=\""+RDCut::cutName(999999,1)+"\","+ "CUT_NAME=\""+RDCut::cutName(999999,1)+"\","+
"CART_NUMBER=999999,"+ "CART_NUMBER=999999,"+
"CART_NUMBER=999999,"+
"DESCRIPTION=\"1 kHz at Reference Level [-16 dBFS]\","+ "DESCRIPTION=\"1 kHz at Reference Level [-16 dBFS]\","+
"OUTCUE=\"[tone]\","+ "OUTCUE=\"[tone]\","+
"CODING_FORMAT=0,"+ "CODING_FORMAT=0,"+
@ -2495,8 +2494,8 @@ bool InitDb(QString name,QString pwd,QString station_name,RDConfig *config)
QString().sprintf("DEFAULT_CART_TYPE=%d,",g->macro?2:1)+ QString().sprintf("DEFAULT_CART_TYPE=%d,",g->macro?2:1)+
QString().sprintf("DEFAULT_LOW_CART=%d,",g->start)+ QString().sprintf("DEFAULT_LOW_CART=%d,",g->start)+
QString().sprintf("DEFAULT_HIGH_CART=%d,",g->end)+ QString().sprintf("DEFAULT_HIGH_CART=%d,",g->end)+
"RPT_TFC=\""+RDYesNo(g->rpt_traffic)+"\","+ "REPORT_TFC=\""+RDYesNo(g->rpt_traffic)+"\","+
"RPT_MUS=\""+RDYesNo(g->rpt_music)+"\","+ "REPORT_MUS=\""+RDYesNo(g->rpt_music)+"\","+
"ENABLE_NOW_NEXT=\""+RDYesNo(g->now_next)+"\""; "ENABLE_NOW_NEXT=\""+RDYesNo(g->now_next)+"\"";
if(!RunQuery(sql)) { if(!RunQuery(sql)) {
return false; return false;