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

culling hearing oneself and testing sound

Browse source
This commit is contained in:
Wayne Chen 2019-03-04 13:33:16 -08:00
parent 90a6e0d9b0
commit 7860db68eb
5 changed files with 7 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -313,12 +313,5 @@ Rectangle {
(bar.currentIndex === 0 && !isVR); (bar.currentIndex === 0 && !isVR);
anchors { left: parent.left; leftMargin: margins.paddings } anchors { left: parent.left; leftMargin: margins.paddings }
} }
LoopbackAudio {
x: margins.paddings
visible: (bar.currentIndex === 1 && isVR) ||
(bar.currentIndex === 0 && !isVR);
anchors { left: parent.left; leftMargin: margins.paddings }
}
} }
} }

12
libraries/audio-client/src/AudioClient.h
View file

@ -213,13 +213,13 @@ public slots:
void setWarnWhenMuted(bool isNoiseGateEnabled, bool emitSignal = true); void setWarnWhenMuted(bool isNoiseGateEnabled, bool emitSignal = true);
bool isWarnWhenMutedEnabled() const { return _warnWhenMuted; } bool isWarnWhenMutedEnabled() const { return _warnWhenMuted; }
virtual bool getLocalEcho() override { return _shouldEchoLocally; } bool getLocalEcho() { return _shouldEchoLocally; }
virtual void setLocalEcho(bool localEcho) override { _shouldEchoLocally = localEcho; } void setLocalEcho(bool localEcho) { _shouldEchoLocally = localEcho; }
virtual void toggleLocalEcho() override { _shouldEchoLocally = !_shouldEchoLocally; } void toggleLocalEcho() { _shouldEchoLocally = !_shouldEchoLocally; }
virtual bool getServerEcho() override { return _shouldEchoToServer; } bool getServerEcho() { return _shouldEchoToServer; }
virtual void setServerEcho(bool serverEcho) override { _shouldEchoToServer = serverEcho; } void setServerEcho(bool serverEcho) { _shouldEchoToServer = serverEcho; }
virtual void toggleServerEcho() override { _shouldEchoToServer = !_shouldEchoToServer; } void toggleServerEcho() { _shouldEchoToServer = !_shouldEchoToServer; }
void processReceivedSamples(const QByteArray& inputBuffer, QByteArray& outputBuffer); void processReceivedSamples(const QByteArray& inputBuffer, QByteArray& outputBuffer);
void sendMuteEnvironmentPacket(); void sendMuteEnvironmentPacket();

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

@ -47,14 +47,6 @@ public slots:
virtual bool setIsStereoInput(bool stereo) = 0; virtual bool setIsStereoInput(bool stereo) = 0;
virtual bool isStereoInput() = 0; virtual bool isStereoInput() = 0;
virtual bool getLocalEcho() = 0;
virtual void setLocalEcho(bool localEcho) = 0;
virtual void toggleLocalEcho() = 0;
virtual bool getServerEcho() = 0;
virtual void setServerEcho(bool serverEcho) = 0;
virtual void toggleServerEcho() = 0;
signals: signals:
void isStereoInputChanged(bool isStereo); void isStereoInputChanged(bool isStereo);
}; };

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

@ -87,44 +87,4 @@ bool AudioScriptingInterface::isStereoInput() {
stereoEnabled = _localAudioInterface->isStereoInput(); stereoEnabled = _localAudioInterface->isStereoInput();
} }
return stereoEnabled; return stereoEnabled;
} }
bool AudioScriptingInterface::getServerEcho() {
bool serverEchoEnabled = false;
if (_localAudioInterface) {
serverEchoEnabled = _localAudioInterface->getServerEcho();
}
return serverEchoEnabled;
}
void AudioScriptingInterface::setServerEcho(bool serverEcho) {
if (_localAudioInterface) {
QMetaObject::invokeMethod(_localAudioInterface, "setServerEcho", Q_ARG(bool, serverEcho));
}
}
void AudioScriptingInterface::toggleServerEcho() {
if (_localAudioInterface) {
QMetaObject::invokeMethod(_localAudioInterface, "toggleServerEcho");
}
}
bool AudioScriptingInterface::getLocalEcho() {
bool localEchoEnabled = false;
if (_localAudioInterface) {
localEchoEnabled = _localAudioInterface->getLocalEcho();
}
return localEchoEnabled;
}
void AudioScriptingInterface::setLocalEcho(bool localEcho) {
if (_localAudioInterface) {
QMetaObject::invokeMethod(_localAudioInterface, "setLocalEcho", Q_ARG(bool, localEcho));
}
}
void AudioScriptingInterface::toggleLocalEcho() {
if (_localAudioInterface) {
QMetaObject::invokeMethod(_localAudioInterface, "toggleLocalEcho");
}
}

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

@ -66,39 +66,6 @@ public:
_localAudioInterface->getAudioSolo().reset(); _localAudioInterface->getAudioSolo().reset();
} }
/**jsdoc
* @function Audio.getServerEcho
*/
Q_INVOKABLE bool getServerEcho();
/**jsdoc
* @function Audio.setServerEcho
* @parm {boolean} serverEcho
*/
Q_INVOKABLE void setServerEcho(bool serverEcho);
/**jsdoc
* @function Audio.toggleServerEcho
*/
Q_INVOKABLE void toggleServerEcho();
/**jsdoc
* @function Audio.getLocalEcho
*/
Q_INVOKABLE bool getLocalEcho();
/**jsdoc
* @function Audio.setLocalEcho
* @parm {boolean} localEcho
*/
Q_INVOKABLE void setLocalEcho(bool localEcho);
/**jsdoc
* @function Audio.toggleLocalEcho
*/
Q_INVOKABLE void toggleLocalEcho();
protected: protected:
AudioScriptingInterface() = default; AudioScriptingInterface() = default;