Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-20 06:58:01 +02:00
Code Issues Projects Releases Wiki Activity

2021-04-16 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed bugs in rdadmin(1) that threw SQL errors when creating
	new host entries.
	* Disabled cloning on hotkey data when creating new host entries
	in rdadmin(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-16 10:18:17 -04:00
parent c5ab8337de
commit 63fd2c6c28
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -21439,3 +21439,8 @@
2021-04-15 Fred Gleason <fredg@paravelsystems.com> 2021-04-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'rdxport.cgi' that broke the build when compiling * Fixed a bug in 'rdxport.cgi' that broke the build when compiling
without the '--enable-rdxport-debug' switch. without the '--enable-rdxport-debug' switch.
2021-04-16 Fred Gleason <fredg@paravelsystems.com>
* Fixed bugs in rdadmin(1) that threw SQL errors when creating
new host entries.
* Disabled cloning on hotkey data when creating new host entries
in rdadmin(1).

11
lib/rdstation.cpp
View File

@ -2,7 +2,7 @@
// //
// Abstract a Rivendell Workstation. // Abstract a Rivendell Workstation.
// //
// (C) Copyright 2002-2020 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -1002,7 +1002,7 @@ bool RDStation::create(const QString &name,QString *err_msg,
sql=QString("insert into RDLIBRARY set ")+ sql=QString("insert into RDLIBRARY set ")+
QString().sprintf("INPUT_CARD=%d,",q->value(0).toInt())+ QString().sprintf("INPUT_CARD=%d,",q->value(0).toInt())+
QString().sprintf("INPUT_PORT=%d,",q->value(1).toInt())+ QString().sprintf("INPUT_PORT=%d,",q->value(1).toInt())+
QString().sprintf("INPUT_TYPE=%d,",q->value(2).toInt())+ "INPUT_TYPE=\""+RDEscapeString(q->value(2).toString())+"\","+
QString().sprintf("OUTPUT_CARD=%d,",q->value(3).toInt())+ QString().sprintf("OUTPUT_CARD=%d,",q->value(3).toInt())+
QString().sprintf("OUTPUT_PORT=%d,",q->value(4).toInt())+ QString().sprintf("OUTPUT_PORT=%d,",q->value(4).toInt())+
QString().sprintf("VOX_THRESHOLD=%d,",q->value(5).toInt())+ QString().sprintf("VOX_THRESHOLD=%d,",q->value(5).toInt())+
@ -1207,7 +1207,7 @@ bool RDStation::create(const QString &name,QString *err_msg,
"DESCRIPTION_TEMPLATE=\""+RDEscapeString(q->value(22).toString())+"\","+ "DESCRIPTION_TEMPLATE=\""+RDEscapeString(q->value(22).toString())+"\","+
"EXIT_PASSWORD=\""+RDEscapeString(q->value(23).toString())+"\","+ "EXIT_PASSWORD=\""+RDEscapeString(q->value(23).toString())+"\","+
"SKIN_PATH=\""+RDEscapeString(q->value(24).toString())+"\","+ "SKIN_PATH=\""+RDEscapeString(q->value(24).toString())+"\","+
"SHOW_COUNTERS=\","+RDEscapeString(q->value(25).toString())+"\","+ "SHOW_COUNTERS=\""+RDEscapeString(q->value(25).toString())+"\","+
"STATION=\""+RDEscapeString(name)+"\""; "STATION=\""+RDEscapeString(name)+"\"";
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
delete q1; delete q1;
@ -1666,6 +1666,9 @@ bool RDStation::create(const QString &name,QString *err_msg,
} }
delete q; delete q;
/*
* FIXME: Reinstate/remove hotkey support!
*
// //
// Clone Hotkeys // Clone Hotkeys
// //
@ -1688,7 +1691,7 @@ bool RDStation::create(const QString &name,QString *err_msg,
delete q1; delete q1;
} }
delete q; delete q;
*/
// //
// Clone PyPAD Instances // Clone PyPAD Instances
// //