SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ovr to 1.8.19, audio key update (#314)

Browse Source 
* added get/setters for override keys

* adjusted QML for new overrides and proper initialized

* replaced work-around key with proper key

* removed workaround from header

* updated OVR to 1.8.19

* changed other new audio variables

* temporarily disabled audio profiles as required api keys are questionable use-ability atm
This commit is contained in:
ykeara
2019-11-09 10:16:14 -06:00
committed by GitHub
parent 05c12cd4a0
commit 4a98ed436e
24 changed files with 734 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/audio_page/AudioPage.qml
-1
View File
@@ -14,7 +14,6 @@ MyStackViewPage {
content: ColumnLayout {
spacing: 24
AudioDeviceSelector {
}
src/res/qml/audio_page/device_selector/AudioDeviceSelector.qml
+19 -4
View File
@@ -12,13 +12,24 @@ RowLayout {
property alias deviceIndex: selector.currentIndex
MyText {
text: deviceText
Layout.preferredWidth: 260
Layout.preferredWidth: 200
}
MyToggleButton {
id: playbackOverrideToggle
Layout.preferredWidth: 250
text: "Toggle Override"
onClicked: {
AudioTabController.setPlaybackOverride(this.checked, false)
}
onCheckedChanged: {
selector.enabled = this.checked
}
}
MyComboBox {
id: selector
Layout.maximumWidth: 850
Layout.minimumWidth: 850
Layout.preferredWidth: 850
Layout.fillWidth: true
onActivated: {
if (deviceIndex >= 0) {
AudioTabController.setPlaybackDeviceIndex(deviceIndex)
@@ -28,6 +39,7 @@ RowLayout {
Component.onCompleted: {
audioPlaybackNameCombo.devices = getAudioDeviceList()
setShownAudioDevice(AudioTabController.playbackDeviceIndex)
playbackOverrideToggle.checked = AudioTabController.playbackOverride
}
Connections {
@@ -39,6 +51,9 @@ RowLayout {
audioPlaybackNameCombo.devices = getAudioDeviceList()
setShownAudioDevice(AudioTabController.playbackDeviceIndex)
}
onPlaybackOverrideChanged: {
playbackOverrideToggle.value = AudioTabController.playbackOverride
}
}
function getAudioDeviceList() {
var devices = []
src/res/qml/audio_page/device_selector/MicDeviceSelector.qml
+17 -4
View File
@@ -15,13 +15,22 @@ RowLayout {
property alias deviceIndex: selector.currentIndex
MyText {
text: deviceText
Layout.preferredWidth: 260
Layout.preferredWidth: 200
}
MyToggleButton {
id: recordingOverrideToggle
Layout.preferredWidth: 250
text: "Toggle Override"
onClicked: {
AudioTabController.setRecordingOverride(this.checked, false)
}
onCheckedChanged: {
selector.enabled = this.checked
}
}
MyComboBox {
id: selector
Layout.maximumWidth: 850
Layout.minimumWidth: 850
Layout.preferredWidth: 850
Layout.fillWidth: true
onActivated: {
if (deviceIndex >= 0) {
AudioTabController.setMicDeviceIndex(currentIndex)
@@ -50,6 +59,7 @@ RowLayout {
Component.onCompleted: {
devices = getAudioDeviceList()
setShownAudioDevice(AudioTabController.micDeviceIndex)
recordingOverrideToggle.checked = AudioTabController.recordingOverride
}
Connections {
target: AudioTabController
@@ -60,5 +70,8 @@ RowLayout {
devices = getAudioDeviceList()
setShownAudioDevice(AudioTabController.micDeviceIndex)
}
onRecordingOverrideChanged: {
recordingOverrideToggle.value = AudioTabController.recordingOverride
}
}
}
src/res/qml/audio_page/dialog_boxes/AudioNewProfileDialog.qml
-6
View File
@@ -58,12 +58,6 @@ MyDialogOkCancelPopup {
}
}
}
Connections {
target: AudioTabController
onAudioProfileDefaultChanged: {
defaultProfileToggle = AudioTabController.audioProfileDefault
}
}
function openPopup() {
audioNewProfileName.text = ""
src/res/qml/audio_page/profiles/ProfileButtons.qml
+6 -3
View File
@@ -5,6 +5,7 @@ import ovras.advsettings 1.0
import "../../common"
import "../dialog_boxes"
//Audio Profiles temporarily disabled.
ColumnLayout {
AudioMessageDialog {
id: audioMessageDialog
@@ -30,6 +31,7 @@ ColumnLayout {
id: audioProfileComboBox
Layout.preferredWidth: 250
model: [""]
enabled: false
onCurrentIndexChanged: {
if (currentIndex > 0) {
audioApplyProfileButton.enabled = true
@@ -43,7 +45,7 @@ ColumnLayout {
MyPushButton {
id: audioApplyProfileButton
enabled: true
enabled: false
Layout.preferredWidth: 150
text: "Apply"
onClicked: {
@@ -63,7 +65,7 @@ ColumnLayout {
MyPushButton {
id: audioDeleteProfileButton
enabled: true
enabled: false
Layout.preferredWidth: 200
text: "Delete Profile"
onClicked: {
@@ -74,6 +76,7 @@ ColumnLayout {
}
}
MyPushButton {
enabled: false
Layout.preferredWidth: 200
text: "New Profile"
onClicked: {
@@ -86,7 +89,7 @@ ColumnLayout {
}
}
Component.onCompleted: {
reloadAudioProfiles()
//reloadAudioProfiles()
}
Connections {
target: AudioTabController
src/tabcontrollers/AudioTabController.cpp
+134 -41
View File
@@ -22,20 +22,20 @@ void AudioTabController::initStage1()
audioManager->init( this );
m_k_audioSettingsUpdateCounter
= utils::adjustUpdateRate( k_audioSettingsUpdateCounter );
initOverride();
m_playbackDevices = audioManager->getPlaybackDevices();
m_recordingDevices = audioManager->getRecordingDevices();
findPlaybackDeviceIndex( audioManager->getPlaybackDevId(), false );
char deviceId[1024];
vr::VRSettings()->GetString(
vr::k_pch_audio_Section,
k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
deviceId,
1024,
&vrSettingsError );
vr::VRSettings()->GetString( vr::k_pch_audio_Section,
vr::k_pch_audio_PlaybackMirrorDevice_String,
deviceId,
1024,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING ) << "Could not read \""
<< k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< vr::k_pch_audio_PlaybackMirrorDevice_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
@@ -53,7 +53,8 @@ void AudioTabController::initStage1()
m_micMuted = audioManager->getMicMuted();
reloadPttProfiles();
reloadPttConfig();
reloadAudioProfiles();
// Temporarily disabled audio profiles for 1.8.19 until api is clear.
// reloadAudioProfiles();
reloadAudioSettings();
eventLoopTick();
@@ -173,18 +174,17 @@ void AudioTabController::eventLoopTick()
char mirrorDeviceId[1024];
vr::VRSettings()->GetString(
vr::k_pch_audio_Section,
k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
vr::k_pch_audio_PlaybackMirrorDevice_String,
mirrorDeviceId,
1024,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING )
<< "Could not read \""
<< k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
LOG( WARNING ) << "Could not read \""
<< vr::k_pch_audio_PlaybackMirrorDevice_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
if ( lastMirrorDevId.compare( mirrorDeviceId ) != 0 )
{
@@ -526,13 +526,13 @@ void AudioTabController::setMirrorDeviceIndex( int index, bool notify )
vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->RemoveKeyInSection(
vr::k_pch_audio_Section,
k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
vr::k_pch_audio_PlaybackMirrorDevice_String,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING )
<< "Could not remove \""
<< k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< vr::k_pch_audio_PlaybackMirrorDevice_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
@@ -551,14 +551,14 @@ void AudioTabController::setMirrorDeviceIndex( int index, bool notify )
vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->SetString(
vr::k_pch_audio_Section,
k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
vr::k_pch_audio_PlaybackMirrorDevice_String,
m_playbackDevices[static_cast<size_t>( index )].first.c_str(),
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING )
<< "Could not write \""
<< k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< vr::k_pch_audio_PlaybackMirrorDevice_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
@@ -938,13 +938,14 @@ void AudioTabController::deleteAudioProfile( unsigned index )
vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->RemoveKeyInSection(
vr::k_pch_audio_Section,
vr::k_pch_audio_OnPlaybackDevice_String,
vr::k_pch_audio_PlaybackDeviceOverrideName_String,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING )
<< "Could not remove \""
<< vr::k_pch_audio_OnPlaybackDevice_String << "\" setting: "
<< vr::k_pch_audio_PlaybackDeviceOverrideName_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
@@ -955,13 +956,14 @@ void AudioTabController::deleteAudioProfile( unsigned index )
vr::VRSettings()->RemoveKeyInSection(
vr::k_pch_audio_Section,
vr::k_pch_audio_OnRecordDevice_String,
vr::k_pch_audio_RecordingDeviceOverrideName_String,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING )
<< "Could not remove \""
<< vr::k_pch_audio_OnRecordDevice_String << "\" setting: "
<< vr::k_pch_audio_RecordingDeviceOverrideName_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
@@ -977,6 +979,99 @@ void AudioTabController::deleteAudioProfile( unsigned index )
}
}
// 1.8.19 changes
//********************
bool AudioTabController::playbackOverride() const
{
return m_isPlaybackOverride;
}
bool AudioTabController::recordingOverride() const
{
return m_isRecordingOverride;
}
void AudioTabController::setPlaybackOverride( bool value, bool notify )
{
if ( value != m_isPlaybackOverride )
{
m_isPlaybackOverride = value;
vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->SetBool(
vr::k_pch_audio_Section,
vr::k_pch_audio_EnablePlaybackDeviceOverride_Bool,
m_isPlaybackOverride,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( ERROR ) << "Could not set playback override setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
if ( notify )
{
emit playbackOverrideChanged();
}
}
}
void AudioTabController::setRecordingOverride( bool value, bool notify )
{
if ( value != m_isRecordingOverride )
{
m_isRecordingOverride = value;
vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->SetBool(
vr::k_pch_audio_Section,
vr::k_pch_audio_EnableRecordingDeviceOverride_Bool,
m_isRecordingOverride,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( ERROR ) << "Could not set recording override setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
if ( notify )
{
emit playbackOverrideChanged();
}
}
}
void AudioTabController::initOverride()
{
vr::EVRSettingsError vrSettingsError;
auto temp = vr::VRSettings()->GetBool(
vr::k_pch_audio_Section,
vr::k_pch_audio_EnableRecordingDeviceOverride_Bool,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( ERROR ) << "Could not get recording override setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
else
{
setRecordingOverride( temp );
}
temp = vr::VRSettings()->GetBool(
vr::k_pch_audio_Section,
vr::k_pch_audio_EnablePlaybackDeviceOverride_Bool,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( ERROR ) << "Could not get playback override setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
else
{
setPlaybackOverride( temp );
}
}
//********************
unsigned AudioTabController::getAudioProfileCount()
{
return static_cast<unsigned int>( audioProfiles.size() );
@@ -1055,13 +1150,13 @@ void AudioTabController::setDefaultPlayback( int index, bool notify )
vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->SetString(
vr::k_pch_audio_Section,
vr::k_pch_audio_OnPlaybackDevice_String,
vr::k_pch_audio_PlaybackDeviceOverrideName_String,
m_playbackDevices[static_cast<size_t>( index )].first.c_str(),
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING ) << "Could not write \""
<< vr::k_pch_audio_OnPlaybackDevice_String
<< vr::k_pch_audio_PlaybackDeviceOverrideName_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
@@ -1079,13 +1174,13 @@ void AudioTabController::setDefaultMic( int index, bool notify )
vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->SetString(
vr::k_pch_audio_Section,
vr::k_pch_audio_OnRecordDevice_String,
vr::k_pch_audio_RecordingDeviceOverrideName_String,
m_recordingDevices[static_cast<size_t>( index )].first.c_str(),
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING ) << "Could not write \""
<< vr::k_pch_audio_OnRecordDevice_String
<< vr::k_pch_audio_RecordingDeviceOverrideName_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
@@ -1105,16 +1200,15 @@ void AudioTabController::setDefaultMirror( int index, bool notify )
vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->RemoveKeyInSection(
vr::k_pch_audio_Section,
k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
vr::k_pch_audio_PlaybackMirrorDevice_String,
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING )
<< "Could not remove \""
<< k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
LOG( WARNING ) << "Could not remove \""
<< vr::k_pch_audio_PlaybackMirrorDevice_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
else
{
@@ -1127,17 +1221,16 @@ void AudioTabController::setDefaultMirror( int index, bool notify )
vr::EVRSettingsError vrSettingsError;
vr::VRSettings()->SetString(
vr::k_pch_audio_Section,
k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND,
vr::k_pch_audio_PlaybackMirrorDevice_String,
m_playbackDevices[static_cast<size_t>( index )].first.c_str(),
&vrSettingsError );
if ( vrSettingsError != vr::VRSettingsError_None )
{
LOG( WARNING )
<< "Could not write \""
<< k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
LOG( WARNING ) << "Could not write \""
<< vr::k_pch_audio_PlaybackMirrorDevice_String
<< "\" setting: "
<< vr::VRSettings()->GetSettingsErrorNameFromEnum(
vrSettingsError );
}
else
{
src/tabcontrollers/AudioTabController.h
+16 -3
View File
@@ -11,9 +11,6 @@ class QQuickWindow;
namespace advsettings
{
// forward declaration
// the following key used to be "onPlaybackMirrorDevice" using a workaround:
static const char* const k_pch_audio_OnPlaybackMirrorDevice_String_WORKAROUND
= "playbackMirrorDevice";
class OverlayController;
struct AudioProfile
@@ -56,6 +53,10 @@ class AudioTabController : public PttController
NOTIFY micReversePttChanged )
Q_PROPERTY( bool audioProfileDefault READ audioProfileDefault WRITE
setAudioProfileDefault NOTIFY audioProfileDefaultChanged )
Q_PROPERTY( bool playbackOverride READ playbackOverride WRITE
setPlaybackOverride NOTIFY playbackOverrideChanged )
Q_PROPERTY( bool recordingOverride READ recordingOverride WRITE
setRecordingOverride NOTIFY recordingOverrideChanged )
private:
vr::VROverlayHandle_t m_ulNotificationOverlayHandle
@@ -73,6 +74,8 @@ private:
bool m_micProximitySensorCanMute = false;
bool m_micReversePtt = false;
bool m_isDefaultAudioProfile = false;
bool m_isPlaybackOverride = false;
bool m_isRecordingOverride = false;
unsigned int m_k_audioSettingsUpdateCounter = 90;
@@ -117,6 +120,8 @@ private:
void setDefaultMirror( int index, bool notify = true );
void setDefaultMic( int index, bool notify = true );
void initOverride();
std::vector<AudioProfile> audioProfiles;
public:
@@ -142,6 +147,8 @@ public:
bool micProximitySensorCanMute() const;
bool micReversePtt() const;
bool audioProfileDefault() const;
bool playbackOverride() const;
bool recordingOverride() const;
void reloadAudioProfiles();
void saveAudioProfiles();
@@ -180,6 +187,9 @@ public slots:
void applyAudioProfile( unsigned index );
void deleteAudioProfile( unsigned index );
void setPlaybackOverride( bool value, bool notify = true );
void setRecordingOverride( bool value, bool notify = true );
void setAudioProfileDefault( bool value, bool notify = true );
signals:
@@ -202,6 +212,9 @@ signals:
void audioProfileAdded();
void audioProfileDefaultChanged( bool value );
void playbackOverrideChanged();
void recordingOverrideChanged();
void defaultProfileDisplay();
};
} // namespace advsettings