2018-06-12 Fred Gleason <fredg@paravelsystems.com>

* Added a 'card-num' parameter to the 'Meter Enable' ['ME'] command
	in caed(8).
	* Added an 'RDCae::enableMetering()' method.
	* Modified rdairplay(1) to enable metering explicitly.
	* Modified rdcartslots(1) to enable metering explicitly.
	* Modified rdlibrary(1) to enable metering explicitly.
	* Modified rdpanel(1) to enable metering explicitly.
This commit is contained in:
Fred Gleason
2018-06-12 19:00:55 +00:00
parent ea11505dbe
commit bb60b722d1
14 changed files with 168 additions and 41 deletions

View File

@@ -145,6 +145,8 @@ MainWidget::MainWidget(QWidget *parent)
//
// CAE Connection
//
connect(rda->cae(),SIGNAL(isConnected(bool)),
this,SLOT(caeConnectedData(bool)));
rda->cae()->connectHost();
//
@@ -342,6 +344,19 @@ QSizePolicy MainWidget::sizePolicy() const
}
void MainWidget::caeConnectedData(bool state)
{
std::vector<int> cards;
cards.push_back(rda->airplayConf()->card(RDAirPlayConf::SoundPanel1Channel));
cards.push_back(rda->airplayConf()->card(RDAirPlayConf::SoundPanel2Channel));
cards.push_back(rda->airplayConf()->card(RDAirPlayConf::SoundPanel3Channel));
cards.push_back(rda->airplayConf()->card(RDAirPlayConf::SoundPanel4Channel));
cards.push_back(rda->airplayConf()->card(RDAirPlayConf::SoundPanel5Channel));
rda->cae()->enableMetering(&cards);
}
void MainWidget::userData()
{
SetCaption();

View File

@@ -49,6 +49,7 @@ class MainWidget : public QWidget
QSizePolicy sizePolicy() const;
private slots:
void caeConnectedData(bool state);
void userData();
void masterTimerData();
void meterData();