update ovr to 1.8.19, audio key update (#314)
* 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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user