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

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

Browse Source 
* Converted rdlogedit(1) to use RDApplication.
This commit is contained in:
Fred Gleason
2018-01-31 00:07:58 -05:00
parent f46ee15dad
commit 0adc505ffa
16 changed files with 163 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/rdapplication.cpp
View File

@@ -38,6 +38,7 @@ RDApplication::RDApplication(const QString &module_name,QObject *parent)
app_cae=NULL;
app_config=NULL;
app_library_conf=NULL;
app_logedit_conf=NULL;
app_panel_conf=NULL;
app_ripc=NULL;
app_station=NULL;
@@ -60,6 +61,9 @@ RDApplication::~RDApplication()
if(app_library_conf!=NULL) {
delete app_library_conf;
}
if(app_logedit_conf!=NULL) {
delete app_logedit_conf;
}
if(app_airplay_conf!=NULL) {
delete app_airplay_conf;
}
@@ -125,6 +129,7 @@ bool RDApplication::open(QString *err_msg)
app_system=new RDSystem();
app_station=new RDStation(app_config->stationName());
app_library_conf=new RDLibraryConf(app_config->stationName());
app_logedit_conf=new RDLogeditConf(app_config->stationName());
app_airplay_conf=new RDAirPlayConf(app_config->stationName(),"RDAIRPLAY");
app_panel_conf=new RDAirPlayConf(app_config->stationName(),"RDPANEL");
app_user=new RDUser();
@@ -159,6 +164,12 @@ RDLibraryConf *RDApplication::libraryConf()
}
RDLogeditConf *RDApplication::logeditConf()
{
return app_logedit_conf;
}
RDAirPlayConf *RDApplication::panelConf()
{
return app_panel_conf;

3
lib/rdapplication.h
View File

@@ -28,6 +28,7 @@
#include <rdconfig.h>
#include <rddb.h>
#include <rdlibrary_conf.h>
#include <rdlogedit_conf.h>
#include <rdripc.h>
#include <rdstation.h>
#include <rdsystem.h>
@@ -44,6 +45,7 @@ class RDApplication : public QObject
RDCae *cae();
RDConfig *config();
RDLibraryConf *libraryConf();
RDLogeditConf *logeditConf();
RDAirPlayConf *panelConf();
RDRipc *ripc();
RDStation *station();
@@ -56,6 +58,7 @@ class RDApplication : public QObject
RDCae *app_cae;
RDConfig *app_config;
RDLibraryConf *app_library_conf;
RDLogeditConf *app_logedit_conf;
RDRipc *app_ripc;
RDStation *app_station;
RDSystem *app_system;