mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-12-05 08:10:21 +01:00
2021-12-21 Fred Gleason <fredg@paravelsystems.com>
* Moved the PANEL_MAX_OUTPUTS define in 'lib/rdsound_panel.h' to RD_SOUNDPANEL_MAX_OUTPUTS in 'lib/rd.h'. * Added a 'RDPortNames' class. * Added a 'RDCoreApplication::portNames()' method. * Refactored rdairplay(1) to use 'RDPortNames'. * Refactored rdpanel(1) to use 'RDPortNames'. * Removed the 'RDAirPlayConf::portName()' method. * Removed the 'RDAirPlayConf::soundPanelChannelName()' method. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -66,6 +66,7 @@ RDCoreApplication::RDCoreApplication(const QString &module_name,
|
||||
app_library_conf=NULL;
|
||||
app_logedit_conf=NULL;
|
||||
app_panel_conf=NULL;
|
||||
app_port_names=NULL;
|
||||
app_ripc=NULL;
|
||||
app_station=NULL;
|
||||
app_system=NULL;
|
||||
@@ -104,6 +105,9 @@ RDCoreApplication::~RDCoreApplication()
|
||||
if(app_panel_conf!=NULL) {
|
||||
delete app_panel_conf;
|
||||
}
|
||||
if(app_port_names!=NULL) {
|
||||
delete app_port_names;
|
||||
}
|
||||
if(app_user!=NULL) {
|
||||
delete app_user;
|
||||
}
|
||||
@@ -214,6 +218,7 @@ bool RDCoreApplication::open(QString *err_msg,RDCoreApplication::ErrorType *err_
|
||||
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_port_names=new RDPortNames(app_config->stationName());
|
||||
app_user=new RDUser();
|
||||
app_cae=new RDCae(app_station,app_config,this);
|
||||
app_ripc=new RDRipc(app_station,app_config,this);
|
||||
@@ -294,6 +299,12 @@ RDAirPlayConf *RDCoreApplication::panelConf()
|
||||
}
|
||||
|
||||
|
||||
RDPortNames *RDCoreApplication::portNames()
|
||||
{
|
||||
return app_port_names;
|
||||
}
|
||||
|
||||
|
||||
RDRipc *RDCoreApplication::ripc()
|
||||
{
|
||||
return app_ripc;
|
||||
|
||||
Reference in New Issue
Block a user