As a follow up of voice testing

* allow to directly go from ATC component to audio component (control volume)
* reordered keypad a bit
* audio setup, "private slots" -> "private"
This commit is contained in:
Klaus Basan
2018-06-02 01:56:20 +02:00
parent 6fb620a8f6
commit c750ad1dfc
10 changed files with 241 additions and 221 deletions

View File

@@ -43,27 +43,26 @@ namespace BlackGui
//! Play notification sounds (at all)
bool playNotificationSounds() const;
private slots:
private:
//! Reload settings
void ps_reloadSettings();
void reloadSettings();
//! Audio device selected
//! \param index audio device index (COM1, COM2)
void ps_audioDeviceSelected(int index);
void onAudioDeviceSelected(int index);
//! Current audio devices changed
void ps_onCurrentAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceInfoList &devices);
void onCurrentAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceInfoList &devices);
//! Audio devices changed
void ps_onAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceInfoList &devices);
void onAudioDevicesChanged(const BlackMisc::Audio::CAudioDeviceInfoList &devices);
//! Loopback toggled
void ps_onLoopbackToggled(bool loopback);
void onLoopbackToggled(bool loopback);
//! Visibilty (show/hide buttons)
void ps_onToggleNotificationSoundsVisibility(bool checked);
void onToggleNotificationSoundsVisibility(bool checked);
private:
//! Audio device lists from settings
void initAudioDeviceLists();
@@ -71,7 +70,7 @@ namespace BlackGui
bool hasAudio() const;
QScopedPointer<Ui::CAudioSetupComponent> ui;
BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::ps_reloadSettings };
BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this, &CAudioSetupComponent::reloadSettings };
};
} // namespace
} // namespace