Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-14 00:25:53 +01:00
Code Issues Projects Releases Wiki Activity

2018-02-01 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Moved command-switch processing into RDApplication.
This commit is contained in:
Fred Gleason
2018-01-31 13:25:48 -05:00
parent 2103fa72c1
commit 3d380c4de8
73 changed files with 520 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
rdairplay/rdairplay.cpp
View File

@@ -132,28 +132,41 @@ MainWidget::MainWidget(QWidget *parent)
//
air_startup_datetime=QDateTime(QDate::currentDate(),QTime::currentTime());
//
// Ensure that system daemons are running
//
RDInitializeDaemons();
//
// Open the Database
//
rda=new RDApplication("RDAirPlay","rdairplay",RDAIRPLAY_USAGE,this);
if(!rda->open(&err_msg)) {
QMessageBox::critical(this,"RDAirPlay - "+tr("Error"),err_msg);
exit(1);
}
connect(RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)),
this,SLOT(logLine(RDConfig::LogPriority,const QString &)));
//
// Read Command Options
//
QString lineno;
RDCmdSwitch *cmd=new RDCmdSwitch(qApp->argc(),qApp->argv(),"rdairplay",
RDAIRPLAY_USAGE);
for(unsigned i=0;i<cmd->keys();i++) {
if(cmd->key(i)=="--skip-db-check") {
}
}
for(unsigned i=0;i<RDAIRPLAY_LOG_QUANTITY;i++) {
air_start_line[i]=0;
air_start_start[i]=false;
for(unsigned j=0;j<cmd->keys();j++) {
if(cmd->key(j)==QString().sprintf("--log%u",i+1)) {
air_start_logname[i]=cmd->value(j);
for(unsigned k=0;k<cmd->value(j).length();k++) {
if(cmd->value(j).at(k)==QChar(':')) {
for(unsigned j=0;j<rda->cmdSwitch()->keys();j++) {
if(rda->cmdSwitch()->key(j)==QString().sprintf("--log%u",i+1)) {
air_start_logname[i]=rda->cmdSwitch()->value(j);
for(unsigned k=0;k<rda->cmdSwitch()->value(j).length();k++) {
if(rda->cmdSwitch()->value(j).at(k)==QChar(':')) {
air_start_logname[i]=
RDDateTimeDecode(cmd->value(j).left(k),air_startup_datetime,
RDDateTimeDecode(rda->cmdSwitch()->value(j).left(k),
air_startup_datetime,
rda->station(),rda->config());
lineno=cmd->value(j).right(cmd->value(j).length()-(k+1));
lineno=rda->cmdSwitch()->value(j).right(rda->cmdSwitch()->value(j).
length()-(k+1));
if(lineno.right(1)=="+") {
air_start_start[i]=true;
lineno=lineno.left(lineno.length()-1);
@@ -161,10 +174,18 @@ MainWidget::MainWidget(QWidget *parent)
air_start_line[i]=lineno.toInt();
}
}
rda->cmdSwitch()->setProcessed(j,true);
}
}
}
delete cmd;
for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
if(!rda->cmdSwitch()->processed(i)) {
QMessageBox::critical(this,"RDAirPlay - "+tr("Error"),
tr("Unknown command option")+": "+
rda->cmdSwitch()->key(i));
exit(2);
}
}
//
// Fix the Window Size
@@ -203,28 +224,13 @@ MainWidget::MainWidget(QWidget *parent)
air_start_next=false;
air_next_button=0;
//
// Ensure that system daemons are running
//
RDInitializeDaemons();
air_action_mode=StartButton::Play;
rda=new RDApplication("RDAirPlay",this);
if(!rda->open(&err_msg)) {
QMessageBox::critical(this,"RDAirPlay - "+tr("Error"),err_msg);
exit(1);
}
logfile=rda->config()->airplayLogname();
str=QString("RDAirPlay")+" v"+VERSION+" - "+tr("Host:");
setCaption(str+" "+rda->config()->stationName());
connect (RDDbStatus(),SIGNAL(logText(RDConfig::LogPriority,const QString &)),
this,SLOT(logLine(RDConfig::LogPriority,const QString &)));
//
// Master Clock Timer
//

4
rdairplay/rdairplay_cs.ts
View File

@@ -640,6 +640,10 @@ OBNOVEN</translation>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown command option</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ModeDisplay</name>

4
rdairplay/rdairplay_de.ts
View File

@@ -640,6 +640,10 @@ AKTUALISIERT</translation>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown command option</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ModeDisplay</name>

4
rdairplay/rdairplay_es.ts
View File

@@ -640,6 +640,10 @@ LISTA</translation>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown command option</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ModeDisplay</name>

4
rdairplay/rdairplay_fr.ts
View File

@@ -640,6 +640,10 @@ DU LOG</translation>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown command option</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ModeDisplay</name>

4
rdairplay/rdairplay_nb.ts
View File

@@ -650,6 +650,10 @@ LASTAR PÅ NYTT</translation>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown command option</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ModeDisplay</name>

4
rdairplay/rdairplay_nn.ts
View File

@@ -650,6 +650,10 @@ LASTAR PÅ NYTT</translation>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown command option</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ModeDisplay</name>

4
rdairplay/rdairplay_pt_BR.ts
View File

@@ -646,6 +646,10 @@ LISTA</translation>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unknown command option</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>ModeDisplay</name>