Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-30 17:20:32 +01: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

20
lib/rdsound_panel.h
View File

@@ -23,10 +23,9 @@
#include <vector>
#include <qdatetime.h>
#include <qlabel.h>
#include <qsignalmapper.h>
#include <QDateTime>
#include <QLabel>
#include <QSignalMapper>
#include <rdbutton_dialog.h>
#include <rdbutton_panel.h>
@@ -43,7 +42,6 @@
//
#define PANEL_BUTTON_SIZE_X 88
#define PANEL_BUTTON_SIZE_Y 80
#define PANEL_MAX_OUTPUTS 5
#define PANEL_SCAN_INTERVAL 10000
class RDSoundPanel : public RDWidget
@@ -170,19 +168,19 @@ class RDSoundPanel : public RDWidget
bool panel_setup_mode;
bool panel_reset_mode;
QWidget *panel_parent;
int panel_card[PANEL_MAX_OUTPUTS];
int panel_port[PANEL_MAX_OUTPUTS];
int panel_card[RD_SOUNDPANEL_MAX_OUTPUTS];
int panel_port[RD_SOUNDPANEL_MAX_OUTPUTS];
int panel_cue_card;
int panel_cue_port;
QString panel_output_text[PANEL_MAX_OUTPUTS];
QString panel_start_rml[PANEL_MAX_OUTPUTS];
QString panel_stop_rml[PANEL_MAX_OUTPUTS];
QString panel_output_text[RD_SOUNDPANEL_MAX_OUTPUTS];
QString panel_start_rml[RD_SOUNDPANEL_MAX_OUTPUTS];
QString panel_stop_rml[RD_SOUNDPANEL_MAX_OUTPUTS];
RDPanelButton *panel_active_buttons[RD_MAX_STREAMS];
bool panel_flash;
int panel_flash_count;
bool panel_flash_state;
QString panel_logfile;
bool panel_timescaling_supported[PANEL_MAX_OUTPUTS];
bool panel_timescaling_supported[RD_SOUNDPANEL_MAX_OUTPUTS];
bool panel_config_panels;
RDEventPlayer *panel_event_player;
QString panel_svcname;