Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 09:03:40 +02:00
Code Issues Projects Releases Wiki Activity

2021-12-21 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* 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:
Fred Gleason
2021-12-21 11:59:28 -05:00
parent 5a42be85cc
commit 0188da4c62
16 changed files with 231 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rdpanel/rdpanel.cpp
View File

@@ -189,9 +189,11 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
// Set Fader Display Numbers
//
int next_output=1;
for(int i=0;i<PANEL_MAX_OUTPUTS;i++) {
for(int i=0;i<RD_SOUNDPANEL_MAX_OUTPUTS;i++) {
bool unique=true;
int output=next_output;
QString label=
rda->portNames()->portName(panel_panel->card(i),panel_panel->port(i));
for(int j=0;j<i;j++) {
if((panel_panel->card(i)==panel_panel->card(j))&&
(panel_panel->port(i)==panel_panel->port(j))) {
@@ -202,8 +204,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
if(unique) {
next_output++;
}
panel_panel->
setOutputText(i,rda->panelConf()->soundPanelChannelName(output));
panel_panel->setOutputText(i,label);
}
//
@@ -299,7 +300,7 @@ void MainWidget::meterData()
double ratio[2]={0.0,0.0};
short level[2];
for(int i=0;i<PANEL_MAX_OUTPUTS;i++) {
for(int i=0;i<RD_SOUNDPANEL_MAX_OUTPUTS;i++) {
if(meter_data_valid[i]) {
rda->cae()->
outputMeterUpdate(panel_panel->card(i),panel_panel->port(i),level);

2
rdpanel/rdpanel.h
View File

@@ -62,7 +62,7 @@ class MainWidget : public RDMainWindow
RDStereoMeter *panel_stereo_meter;
RDSoundPanel *panel_panel;
RDEventPlayer *panel_player;
bool meter_data_valid[PANEL_MAX_OUTPUTS];
bool meter_data_valid[RD_SOUNDPANEL_MAX_OUTPUTS];
QString panel_filter;
QString panel_group;
QString panel_schedcode;