Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-01-12 23:55:56 +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

25
lib/rdapplication.cpp
View File

@@ -29,14 +29,18 @@
RDApplication *rda=NULL;
RDApplication::RDApplication(const QString &module_name,QObject *parent)
RDApplication::RDApplication(const QString &module_name,const QString &cmdname,
const QString &usage,QObject *parent)
: QObject(parent)
{
app_module_name=module_name;
app_command_name=cmdname;
app_usage=usage;
app_heartbeat=NULL;
app_airplay_conf=NULL;
app_cae=NULL;
app_cmd_switch=NULL;
app_config=NULL;
app_library_conf=NULL;
app_logedit_conf=NULL;
@@ -80,6 +84,9 @@ RDApplication::~RDApplication()
if(app_cae!=NULL) {
delete app_cae;
}
if(app_cmd_switch!=NULL) {
delete app_cmd_switch;
}
if(app_ripc!=NULL) {
delete app_ripc;
}
@@ -95,14 +102,14 @@ bool RDApplication::open(QString *err_msg)
//
// Read command switches
//
RDCmdSwitch *cmd=new RDCmdSwitch(qApp->argc(),qApp->argv(),"","");
for(unsigned i=0;i<cmd->keys();i++) {
if(cmd->key(i)=="--skip-db-check") {
app_cmd_switch=new RDCmdSwitch(qApp->argc(),qApp->argv(),app_command_name,
app_usage);
for(unsigned i=0;i<app_cmd_switch->keys();i++) {
if(app_cmd_switch->key(i)=="--skip-db-check") {
skip_db_check=true;
cmd->setProcessed(i,true);
app_cmd_switch->setProcessed(i,true);
}
}
delete cmd;
//
// Open rd.conf(5)
@@ -157,6 +164,12 @@ RDCae *RDApplication::cae()
}
RDCmdSwitch *RDApplication::cmdSwitch()
{
return app_cmd_switch;
}
RDConfig *RDApplication::config()
{
return app_config;

9
lib/rdapplication.h
View File

@@ -25,6 +25,7 @@
#include <rdairplay_conf.h>
#include <rdcae.h>
#include <rdcmd_switch.h>
#include <rdconfig.h>
#include <rddb.h>
#include <rddbheartbeat.h>
@@ -39,11 +40,13 @@ class RDApplication : public QObject
{
Q_OBJECT;
public:
RDApplication(const QString &module_name,QObject *parent=0);
RDApplication(const QString &module_name,const QString &cmdname,
const QString &usage,QObject *parent=0);
~RDApplication();
bool open(QString *err_msg);
RDAirPlayConf *airplayConf();
RDCae *cae();
RDCmdSwitch *cmdSwitch();
RDConfig *config();
RDLibraryConf *libraryConf();
RDLogeditConf *logeditConf();
@@ -57,6 +60,7 @@ class RDApplication : public QObject
RDAirPlayConf *app_airplay_conf;
RDAirPlayConf *app_panel_conf;
RDCae *app_cae;
RDCmdSwitch *app_cmd_switch;
RDConfig *app_config;
RDLibraryConf *app_library_conf;
RDLogeditConf *app_logedit_conf;
@@ -65,8 +69,9 @@ class RDApplication : public QObject
RDSystem *app_system;
RDUser *app_user;
RDDbHeartbeat *app_heartbeat;
QString app_command_name;
QString app_module_name;
QString app_command_name;
QString app_usage;
};
extern RDApplication *rda;