mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-27 11:05:44 +08:00
[AFV] Ref T731, Ref T739 display registered devices in UI
This commit is contained in:
committed by
Mat Sutcliffe
parent
87f078a698
commit
2b1d771275
@@ -31,6 +31,7 @@ namespace BlackGui
|
|||||||
connect(sGui->getCContextAudioBase(), &CContextAudioBase::stoppedAudio, this, &CAudioAdvancedDistributedComponent::onAudioStoppend, Qt::QueuedConnection);
|
connect(sGui->getCContextAudioBase(), &CContextAudioBase::stoppedAudio, this, &CAudioAdvancedDistributedComponent::onAudioStoppend, Qt::QueuedConnection);
|
||||||
connect(ui->pb_EnableDisable, &QPushButton::pressed, this, &CAudioAdvancedDistributedComponent::toggleAudioEnableDisable, Qt::QueuedConnection);
|
connect(ui->pb_EnableDisable, &QPushButton::pressed, this, &CAudioAdvancedDistributedComponent::toggleAudioEnableDisable, Qt::QueuedConnection);
|
||||||
connect(ui->pb_StartStop, &QPushButton::pressed, this, &CAudioAdvancedDistributedComponent::toggleAudioStartStop, Qt::QueuedConnection);
|
connect(ui->pb_StartStop, &QPushButton::pressed, this, &CAudioAdvancedDistributedComponent::toggleAudioStartStop, Qt::QueuedConnection);
|
||||||
|
connect(ui->pb_ReloadRegistered, &QPushButton::pressed, this, &CAudioAdvancedDistributedComponent::reloadRegistered, Qt::QueuedConnection);
|
||||||
|
|
||||||
this->setButtons();
|
this->setButtons();
|
||||||
}
|
}
|
||||||
@@ -74,6 +75,13 @@ namespace BlackGui
|
|||||||
this->setButtons(2000);
|
this->setButtons(2000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CAudioAdvancedDistributedComponent::reloadRegistered()
|
||||||
|
{
|
||||||
|
if (!hasContexts()) { return; }
|
||||||
|
const CAudioDeviceInfoList registeredDevices = sGui->getIContextAudio()->getRegisteredDevices();
|
||||||
|
ui->tvp_RegisteredDevices->updateContainerMaybeAsync(registeredDevices);
|
||||||
|
}
|
||||||
|
|
||||||
void CAudioAdvancedDistributedComponent::setButtons()
|
void CAudioAdvancedDistributedComponent::setButtons()
|
||||||
{
|
{
|
||||||
if (!hasContexts()) { return; }
|
if (!hasContexts()) { return; }
|
||||||
@@ -100,11 +108,13 @@ namespace BlackGui
|
|||||||
Q_UNUSED(inputDevice)
|
Q_UNUSED(inputDevice)
|
||||||
Q_UNUSED(outputDevice)
|
Q_UNUSED(outputDevice)
|
||||||
this->setButtons();
|
this->setButtons();
|
||||||
|
this->reloadRegistered();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAudioAdvancedDistributedComponent::onAudioStoppend()
|
void CAudioAdvancedDistributedComponent::onAudioStoppend()
|
||||||
{
|
{
|
||||||
this->setButtons();
|
this->setButtons();
|
||||||
|
this->reloadRegistered();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CAudioAdvancedDistributedComponent::hasContexts()
|
bool CAudioAdvancedDistributedComponent::hasContexts()
|
||||||
|
|||||||
@@ -42,6 +42,9 @@ namespace BlackGui
|
|||||||
//! Audio enable/disable
|
//! Audio enable/disable
|
||||||
void toggleAudioEnableDisable();
|
void toggleAudioEnableDisable();
|
||||||
|
|
||||||
|
//! Reload registered devices
|
||||||
|
void reloadRegistered();
|
||||||
|
|
||||||
//! Start/stop button @{
|
//! Start/stop button @{
|
||||||
void setButtons();
|
void setButtons();
|
||||||
void setButtons(int delayMs);
|
void setButtons(int delayMs);
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>166</width>
|
<width>270</width>
|
||||||
<height>55</height>
|
<height>275</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@@ -21,13 +21,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="1">
|
|
||||||
<widget class="QPushButton" name="pb_StartStop">
|
|
||||||
<property name="text">
|
|
||||||
<string>stop</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QLabel" name="lbl_EnableDisable">
|
<widget class="QLabel" name="lbl_EnableDisable">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -35,6 +28,16 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="3" column="0" colspan="2">
|
||||||
|
<widget class="BlackGui::Views::CAudioDeviceInfoView" name="tvp_RegisteredDevices">
|
||||||
|
<attribute name="verticalHeaderVisible">
|
||||||
|
<bool>false</bool>
|
||||||
|
</attribute>
|
||||||
|
<attribute name="verticalHeaderHighlightSections">
|
||||||
|
<bool>true</bool>
|
||||||
|
</attribute>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
<widget class="QLabel" name="lbl_StartStop">
|
<widget class="QLabel" name="lbl_StartStop">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -42,8 +45,29 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="1" column="1">
|
||||||
|
<widget class="QPushButton" name="pb_StartStop">
|
||||||
|
<property name="text">
|
||||||
|
<string>stop</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="2" column="1">
|
||||||
|
<widget class="QPushButton" name="pb_ReloadRegistered">
|
||||||
|
<property name="text">
|
||||||
|
<string>reload registered</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
<customwidgets>
|
||||||
|
<customwidget>
|
||||||
|
<class>BlackGui::Views::CAudioDeviceInfoView</class>
|
||||||
|
<extends>QTableView</extends>
|
||||||
|
<header>blackgui/views/audiodeviceinfoview.h</header>
|
||||||
|
</customwidget>
|
||||||
|
</customwidgets>
|
||||||
<tabstops>
|
<tabstops>
|
||||||
<tabstop>pb_StartStop</tabstop>
|
<tabstop>pb_StartStop</tabstop>
|
||||||
</tabstops>
|
</tabstops>
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ namespace BlackGui
|
|||||||
Q_ASSERT(c);
|
Q_ASSERT(c);
|
||||||
|
|
||||||
// context
|
// context
|
||||||
c = connect(sGui->getCContextAudioBase(), &CContextAudioBase::changedAudioDevices, this, &CAudioDeviceVolumeSetupComponent::onAudioDevicesChanged, Qt::QueuedConnection);
|
c = connect(sGui->getCContextAudioBase(), &CContextAudioBase::changedLocalAudioDevices, this, &CAudioDeviceVolumeSetupComponent::onAudioDevicesChanged, Qt::QueuedConnection);
|
||||||
Q_ASSERT(c);
|
Q_ASSERT(c);
|
||||||
c = connect(sGui->getCContextAudioBase(), &CContextAudioBase::startedAudio, this, &CAudioDeviceVolumeSetupComponent::onAudioStarted, Qt::QueuedConnection);
|
c = connect(sGui->getCContextAudioBase(), &CContextAudioBase::startedAudio, this, &CAudioDeviceVolumeSetupComponent::onAudioStarted, Qt::QueuedConnection);
|
||||||
Q_ASSERT(c);
|
Q_ASSERT(c);
|
||||||
|
|||||||
Reference in New Issue
Block a user