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

2018-05-16 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added virtual logs to the 'Start/Stop Settings' section of
	the 'Configure RDAirPlay' dialog in rdadmin(1).
This commit is contained in:
Fred Gleason 2018-05-16 19:06:15 +00:00
parent 17d4817045
commit fd7b71f345
5 changed files with 66 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16810,3 +16810,6 @@
2018-05-09 Fred Gleason <fredg@paravelsystems.com>
* Added a 'LOG_MACHINES' table to the database.
* Incremented the database version to 278.
2018-05-16 Fred Gleason <fredg@paravelsystems.com>
* Added virtual logs to the 'Start/Stop Settings' section of
the 'Configure RDAirPlay' dialog in rdadmin(1).

2
lib/rd.h
View File

@ -586,7 +586,7 @@
* RDVAirPlay Values
*/
#define RD_RDVAIRPLAY_LOG_BASE 100
#define RD_RDVAIRPLAY_LOG_QUAN 1
#define RD_RDVAIRPLAY_LOG_QUAN 20
#endif // RD_H

18
rdadmin/createdb.cpp
View File

@ -8132,13 +8132,19 @@ int UpdateDb(int ver,RDConfig *config)
}
delete q;
}
for(int i=RD_RDVAIRPLAY_LOG_BASE;i<(RD_RDVAIRPLAY_LOG_BASE+RD_RDVAIRPLAY_LOG_QUAN);i++) {
sql=QString("insert into LOG_MACHINES set ")+
"STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+
QString().sprintf("MACHINE=%d",i);
q=new RDSqlQuery(sql);
delete q;
sql=QString("select NAME from STATIONS");
q=new RDSqlQuery(sql,false);
while(q->next()) {
for(int i=RD_RDVAIRPLAY_LOG_BASE;i<(RD_RDVAIRPLAY_LOG_BASE+RD_RDVAIRPLAY_LOG_QUAN);i++) {
sql=QString("insert into LOG_MACHINES set ")+
"STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+
QString().sprintf("MACHINE=%d",i);
q1=new RDSqlQuery(sql);
delete q1;
}
}
delete q;
for(int i=0;i<3;i++) {
sql=QString().sprintf("alter table RDAIRPLAY drop column UDP_ADDR%d",i);

64
rdadmin/edit_rdairplay.cpp
View File

@ -660,6 +660,9 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
for(unsigned i=1;i<RDAIRPLAY_LOG_QUANTITY;i++) {
air_logmachine_box->insertItem(QString().sprintf("Aux %d Log",i));
}
for(unsigned i=0;i<RD_RDVAIRPLAY_LOG_QUAN;i++) {
air_logmachine_box->insertItem(QString().sprintf("vLog %d",i+RD_RDVAIRPLAY_LOG_BASE+1));
}
connect(air_logmachine_box,SIGNAL(activated(int)),
this,SLOT(logActivatedData(int)));
@ -887,16 +890,25 @@ EditRDAirPlay::EditRDAirPlay(RDStation *station,RDStation *cae_station,
}
air_modecontrol_box->setCurrentItem((int)air_conf->opModeStyle());
for(int i=0;i<RDAIRPLAY_LOG_QUANTITY;i++) {
air_startmode[i]=air_conf->startMode(i);
air_startlog[i]=air_conf->logName(i);
air_autorestart[i]=air_conf->autoRestart(i);
air_startmodes[i]=air_conf->startMode(i);
air_startlogs[i]=air_conf->logName(i);
air_autorestarts[i]=air_conf->autoRestart(i);
air_logstartmode_box[i]->setCurrentItem(air_conf->logStartMode(i));
}
air_startmode_box->setCurrentItem((int)air_startmode[air_logmachine]);
air_startlog_edit->setText(air_startlog[air_logmachine]);
air_autorestart_box->setChecked(air_autorestart[air_logmachine]);
for(int i=0;i<RD_RDVAIRPLAY_LOG_QUAN;i++) {
air_startmodes[i+RD_RDVAIRPLAY_LOG_BASE]=
air_conf->startMode(i+RD_RDVAIRPLAY_LOG_BASE);
air_startlogs[i+RD_RDVAIRPLAY_LOG_BASE]=
air_conf->logName(i+RD_RDVAIRPLAY_LOG_BASE);
air_autorestarts[i+RD_RDVAIRPLAY_LOG_BASE]=
air_conf->autoRestart(i+RD_RDVAIRPLAY_LOG_BASE);
// air_logstartmode_boxs[i]->setCurrentItem(air_conf->logStartMode(i));
}
air_startmode_box->setCurrentItem((int)air_startmodes[air_logmachine]);
air_startlog_edit->setText(air_startlogs[air_logmachine]);
air_autorestart_box->setChecked(air_autorestarts[air_logmachine]);
air_skin_edit->setText(air_conf->skinPath());
startModeChangedData(air_startmode[air_logmachine]);
startModeChangedData(air_startmodes[air_logmachine]);
for(unsigned i=0;i<RDAirPlayConf::LastChannel;i++) {
audioSettingsChangedData(i,air_card_sel[i]->card(),air_card_sel[i]->port());
@ -968,16 +980,20 @@ void EditRDAirPlay::exitPasswordChangedData(const QString &str)
void EditRDAirPlay::logActivatedData(int lognum)
{
air_startmode[air_logmachine]=
air_startmodes[air_logmachine]=
(RDAirPlayConf::StartMode)air_startmode_box->currentItem();
air_startlog[air_logmachine]=air_startlog_edit->text();
air_autorestart[air_logmachine]=air_autorestart_box->isChecked();
air_startlogs[air_logmachine]=air_startlog_edit->text();
air_autorestarts[air_logmachine]=air_autorestart_box->isChecked();
air_logmachine=lognum;
air_startmode_box->setCurrentItem((int)air_startmode[lognum]);
air_startlog_edit->setText(air_startlog[lognum]);
air_autorestart_box->setChecked(air_autorestart[lognum]);
startModeChangedData((int)air_startmode[lognum]);
if(lognum>2) {
air_logmachine=lognum+RD_RDVAIRPLAY_LOG_BASE-3;
}
air_startmode_box->setCurrentItem((int)air_startmodes[air_logmachine]);
air_startlog_edit->setText(air_startlogs[air_logmachine]);
air_autorestart_box->setChecked(air_autorestarts[air_logmachine]);
startModeChangedData((int)air_startmodes[air_logmachine]);
}
@ -1120,20 +1136,28 @@ void EditRDAirPlay::okData()
if(air_exitpasswd_changed) {
air_conf->setExitPassword(air_exitpasswd_edit->text());
}
air_startmode[air_logmachine]=
air_startmodes[air_logmachine]=
(RDAirPlayConf::StartMode)air_startmode_box->currentItem();
air_startlog[air_logmachine]=air_startlog_edit->text();
air_autorestart[air_logmachine]=air_autorestart_box->isChecked();
air_startlogs[air_logmachine]=air_startlog_edit->text();
air_autorestarts[air_logmachine]=air_autorestart_box->isChecked();
air_conf->setOpModeStyle((RDAirPlayConf::OpModeStyle)
air_modecontrol_box->currentItem());
for(int i=0;i<RDAIRPLAY_LOG_QUANTITY;i++) {
air_conf->setStartMode(i,air_startmode[i]);
air_conf->setLogName(i,air_startlog[i]);
air_conf->setAutoRestart(i,air_autorestart[i]);
air_conf->setStartMode(i,air_startmodes[i]);
air_conf->setLogName(i,air_startlogs[i]);
air_conf->setAutoRestart(i,air_autorestarts[i]);
air_conf->
setLogStartMode(i,(RDAirPlayConf::OpMode)air_logstartmode_box[i]->
currentItem());
}
for(int i=0;i<RD_RDVAIRPLAY_LOG_QUAN;i++) {
air_conf->setStartMode(i+RD_RDVAIRPLAY_LOG_BASE,
air_startmodes[i+RD_RDVAIRPLAY_LOG_BASE]);
air_conf->setLogName(i+RD_RDVAIRPLAY_LOG_BASE,
air_startlogs[i+RD_RDVAIRPLAY_LOG_BASE]);
air_conf->setAutoRestart(i+RD_RDVAIRPLAY_LOG_BASE,
air_autorestarts[i+RD_RDVAIRPLAY_LOG_BASE]);
}
air_conf->setSkinPath(air_skin_edit->text());
done(0);
}

9
rdadmin/edit_rdairplay.h
View File

@ -119,13 +119,16 @@ class EditRDAirPlay : public QDialog
int air_logmachine;
QComboBox *air_logmachine_box;
QComboBox *air_startmode_box;
RDAirPlayConf::StartMode air_startmode[RDAIRPLAY_LOG_QUANTITY];
// RDAirPlayConf::StartMode air_startmode[RDAIRPLAY_LOG_QUANTITY];
QMap<int,RDAirPlayConf::StartMode> air_startmodes;
QLineEdit *air_startlog_edit;
QLabel *air_startlog_label;
QPushButton *air_startlog_button;
QString air_startlog[RDAIRPLAY_LOG_QUANTITY];
// QString air_startlog[RDAIRPLAY_LOG_QUANTITY];
QMap<int,QString> air_startlogs;
QCheckBox *air_autorestart_box;
bool air_autorestart[RDAIRPLAY_LOG_QUANTITY];
// bool air_autorestart[RDAIRPLAY_LOG_QUANTITY];
QMap<int,bool> air_autorestarts;
QLabel *air_autorestart_label;
QLineEdit *air_skin_edit;
QLineEdit *air_title_template_edit;