Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-13 11:34:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CR feedback

Browse source
This commit is contained in:
David Kelly 2016-12-22 18:09:19 -08:00
parent 2e897e0cc9
commit 9eed430f49
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/resources/qml/hifi/Pal.qml
View file

@ -346,15 +346,18 @@ Item {
} }
break; break;
case 'updateAudioLevel': case 'updateAudioLevel':
var userId = message.params[0]; for (var userId in message.params) {
var audioLevel = message.params[1]; var audioLevel = message.params[userId];
if (!userId) { // If the userId is 0, we're updating "myData".
myData.audioLevel = audioLevel; if (userId == 0) {
myCard.audioLevel = audioLevel; myData.audioLevel = audioLevel;
} else { myCard.audioLevel = audioLevel; // Defensive programming
var userIndex = findSessionIndex(userId); } else {
userModel.get(userIndex).audioLevel = audioLevel; console.log("userid:" + userId);
userData[userIndex].audioLevel = audioLevel; var userIndex = findSessionIndex(userId);
userModel.get(userIndex).audioLevel = audioLevel;
userData[userIndex].audioLevel = audioLevel; // Defensive programming
}
} }
break; break;
default: default:

8
scripts/system/pal.js
View file

@ -120,7 +120,7 @@ function populateUserList() {
displayName: avatar.sessionDisplayName, displayName: avatar.sessionDisplayName,
userName: '', userName: '',
sessionId: id || '', sessionId: id || '',
audioLevel: getAudioLevel(id) audioLevel: 0.0
}; };
// If the current user is an admin OR // If the current user is an admin OR
// they're requesting their own username ("id" is blank)... // they're requesting their own username ("id" is blank)...
@ -300,10 +300,14 @@ function getAudioLevel(id) {
// TODO: tune for efficiency - expecially with large numbers of avatars // TODO: tune for efficiency - expecially with large numbers of avatars
Script.setInterval(function () { Script.setInterval(function () {
if (pal.visible) { if (pal.visible) {
var param = {};
AvatarList.getAvatarIdentifiers().sort().forEach(function (id) { AvatarList.getAvatarIdentifiers().sort().forEach(function (id) {
var level = getAudioLevel(id); var level = getAudioLevel(id);
pal.sendToQml({method: 'updateAudioLevel', params: [id, level]}); // qml didn't like an object with null/empty string for a key, so...
var userId = id || 0;
param[userId]= level;
}); });
pal.sendToQml({method: 'updateAudioLevel', params: param});
} }
}, AUDIO_LEVEL_UPDATE_INTERVAL_MS); }, AUDIO_LEVEL_UPDATE_INTERVAL_MS);
// //