Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:42:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make stereo interface async

Browse source
This commit is contained in:
Atlante45 2018-06-18 17:25:38 -07:00
parent 29ff47c6fb
commit 4a4c0d132e
5 changed files with 36 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/audio/Audio.qml
View file

@ -129,12 +129,10 @@ Rectangle {
id: stereoMic id: stereoMic
spacing: muteMic.spacing; spacing: muteMic.spacing;
text: qsTr("Enable stereo input"); text: qsTr("Enable stereo input");
checked: AudioScriptingInterface.isStereoInput(); checked: AudioScriptingInterface.isStereoInput;
onClicked: { onClicked: {
var success = AudioScriptingInterface.setStereoInput(checked); AudioScriptingInterface.isStereoInput = checked;
if (!success) { checked = Qt.binding(function() { return AudioScriptingInterface.isStereoInput; }); // restore binding
checked = !checked;
}
} }
} }
} }

2
libraries/audio-client/src/AudioClient.cpp
View file

@ -1426,6 +1426,8 @@ bool AudioClient::setIsStereoInput(bool isStereoInput) {
// restart the input device // restart the input device
switchInputToAudioDevice(_inputDeviceInfo); switchInputToAudioDevice(_inputDeviceInfo);
emit isStereoInputChanged(_isStereoInput);
} }
return stereoInputChanged; return stereoInputChanged;

3
libraries/audio/src/AbstractAudioInterface.h
View file

@ -44,6 +44,9 @@ public slots:
virtual bool setIsStereoInput(bool stereo) = 0; virtual bool setIsStereoInput(bool stereo) = 0;
virtual bool isStereoInput() = 0; virtual bool isStereoInput() = 0;
signals:
void isStereoInputChanged(bool isStereo);
}; };
Q_DECLARE_METATYPE(AbstractAudioInterface*) Q_DECLARE_METATYPE(AbstractAudioInterface*)

28
libraries/script-engine/src/AudioScriptingInterface.cpp
View file

@ -23,6 +23,21 @@ void registerAudioMetaTypes(QScriptEngine* engine) {
qScriptRegisterMetaType(engine, soundSharedPointerToScriptValue, soundSharedPointerFromScriptValue); qScriptRegisterMetaType(engine, soundSharedPointerToScriptValue, soundSharedPointerFromScriptValue);
} }
void AudioScriptingInterface::setLocalAudioInterface(AbstractAudioInterface* audioInterface) {
if (_localAudioInterface) {
disconnect(_localAudioInterface, &AbstractAudioInterface::isStereoInputChanged,
this, &AudioScriptingInterface::isStereoInputChanged);
}
_localAudioInterface = audioInterface;
if (_localAudioInterface) {
connect(_localAudioInterface, &AbstractAudioInterface::isStereoInputChanged,
this, &AudioScriptingInterface::isStereoInputChanged);
}
}
ScriptAudioInjector* AudioScriptingInterface::playSystemSound(SharedSoundPointer sound, const QVector3D& position) { ScriptAudioInjector* AudioScriptingInterface::playSystemSound(SharedSoundPointer sound, const QVector3D& position) {
AudioInjectorOptions options; AudioInjectorOptions options;
options.position = glm::vec3(position.x(), position.y(), position.z()); options.position = glm::vec3(position.x(), position.y(), position.z());
@ -60,21 +75,12 @@ ScriptAudioInjector* AudioScriptingInterface::playSound(SharedSoundPointer sound
} }
} }
bool AudioScriptingInterface::setStereoInput(bool stereo) { void AudioScriptingInterface::setStereoInput(bool stereo) {
bool stereoInputChanged = false;
if (_localAudioInterface) { if (_localAudioInterface) {
if (QThread::currentThread() != _localAudioInterface->thread()) { QMetaObject::invokeMethod(_localAudioInterface, "setIsStereoInput", Q_ARG(bool, stereo));
// TODO: This can block the main thread which is not ideal, make this function and the UI calling it async
BLOCKING_INVOKE_METHOD(_localAudioInterface, "setIsStereoInput", Q_RETURN_ARG(bool, stereoInputChanged),
Q_ARG(bool, stereo));
} else {
stereoInputChanged = _localAudioInterface->setIsStereoInput(stereo);
} }
} }
return stereoInputChanged;
}
bool AudioScriptingInterface::isStereoInput() { bool AudioScriptingInterface::isStereoInput() {
bool stereoEnabled = false; bool stereoEnabled = false;
if (_localAudioInterface) { if (_localAudioInterface) {

14
libraries/script-engine/src/AudioScriptingInterface.h
View file

@ -23,9 +23,11 @@ class AudioScriptingInterface : public QObject, public Dependency {
Q_OBJECT Q_OBJECT
SINGLETON_DEPENDENCY SINGLETON_DEPENDENCY
Q_PROPERTY(bool isStereoInput READ isStereoInput WRITE setStereoInput NOTIFY isStereoInputChanged)
public: public:
virtual ~AudioScriptingInterface() {} virtual ~AudioScriptingInterface() {}
void setLocalAudioInterface(AbstractAudioInterface* audioInterface) { _localAudioInterface = audioInterface; } void setLocalAudioInterface(AbstractAudioInterface* audioInterface);
protected: protected:
AudioScriptingInterface() {} AudioScriptingInterface() {}
@ -52,9 +54,8 @@ protected:
/**jsdoc /**jsdoc
* @function Audio.setStereoInput * @function Audio.setStereoInput
* @param {boolean} stereo * @param {boolean} stereo
* @returns {boolean}
*/ */
Q_INVOKABLE bool setStereoInput(bool stereo); Q_INVOKABLE void setStereoInput(bool stereo);
/**jsdoc /**jsdoc
* @function Audio.isStereoInput * @function Audio.isStereoInput
@ -114,6 +115,13 @@ signals:
*/ */
void inputReceived(const QByteArray& inputSamples); void inputReceived(const QByteArray& inputSamples);
/**jsdoc
* @function Audio.isStereoInputChanged
* @param {boolean} isStereo
* @returns {Signal}
*/
void isStereoInputChanged(bool isStereo);
private: private:
AbstractAudioInterface* _localAudioInterface { nullptr }; AbstractAudioInterface* _localAudioInterface { nullptr };
}; };