Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 18:13:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1473 from Penguin-Guru/AudioOutputTest

Browse source 
Remove second argument from some playSystemSound() calls in QML.
This commit is contained in:
Dale Glass 2021-12-11 20:58:54 +01:00 committed by GitHub
commit d4a832a0c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/audio/PlaySampleSound.qml
View file

@ -25,10 +25,8 @@ RowLayout {
sample = null; sample = null;
} }
function playSound() { function playSound() {
// FIXME: MyAvatar is not properly exposed to QML; MyAvatar.qmlPosition is a stopgap
// FIXME: AudioScriptingInterface.playSystemSound should not require position
if (sample === null && !isPlaying) { if (sample === null && !isPlaying) {
sample = AudioScriptingInterface.playSystemSound(sound, MyAvatar.qmlPosition); sample = AudioScriptingInterface.playSystemSound(sound);
isPlaying = true; isPlaying = true;
sample.finished.connect(reset); sample.finished.connect(reset);
} }

4
interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
View file

@ -384,10 +384,8 @@ Flickable {
sample = null; sample = null;
} }
function playSound() { function playSound() {
// FIXME: MyAvatar is not properly exposed to QML; MyAvatar.qmlPosition is a stopgap
// FIXME: AudioScriptingInterface.playSystemSound should not require position
if (sample === null && !isPlaying) { if (sample === null && !isPlaying) {
sample = AudioScriptingInterface.playSystemSound(sound, MyAvatar.qmlPosition); sample = AudioScriptingInterface.playSystemSound(sound);
isPlaying = true; isPlaying = true;
sample.finished.connect(reset); sample.finished.connect(reset);
} }

4
interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
View file

@ -386,10 +386,8 @@ Flickable {
sample = null; sample = null;
} }
function playSound() { function playSound() {
// FIXME: MyAvatar is not properly exposed to QML; MyAvatar.qmlPosition is a stopgap
// FIXME: AudioScriptingInterface.playSystemSound should not require position
if (sample === null && !isPlaying) { if (sample === null && !isPlaying) {
sample = AudioScriptingInterface.playSystemSound(sound, MyAvatar.qmlPosition); sample = AudioScriptingInterface.playSystemSound(sound);
isPlaying = true; isPlaying = true;
sample.finished.connect(reset); sample.finished.connect(reset);
} }

1
interface/src/avatar/MyAvatar.h
View file

@ -171,6 +171,7 @@ class MyAvatar : public Avatar {
* registration point of the 3D model. * registration point of the 3D model.
* *
* @property {Vec3} qmlPosition - A synonym for <code>position</code> for use by QML. * @property {Vec3} qmlPosition - A synonym for <code>position</code> for use by QML.
* <p class="important">Deprecated: This property is deprecated and will be removed.</p>
* *
* @property {Vec3} feetPosition - The position of the avatar's feet. * @property {Vec3} feetPosition - The position of the avatar's feet.
* @property {boolean} shouldRenderLocally=true - If <code>true</code> then your avatar is rendered for you in Interface, * @property {boolean} shouldRenderLocally=true - If <code>true</code> then your avatar is rendered for you in Interface,