e9e436378a
When refusing ("thumbs down" button) echo test, user is able to select a different input device. This should work fine for chrome, firefox and safari (once user grants permission when asked by html5client).
For output devices, we depend on setSinkId function, which is enabled by default on current chrome release (2020) but not in Firefox (user needs to enable "setSinkId in about:config page). This implementation is listed as (?) in MDN.
In other words, output device selection should work out of the box for chrome, only.
When selecting an outputDevice, all alert sounds (hangup, screenshare , polling, etc) also goes to the same output device.
This solves #10592
92 lines
3.1 KiB
JavaScript
Executable File
92 lines
3.1 KiB
JavaScript
Executable File
import Users from '/imports/api/users';
|
|
import Auth from '/imports/ui/services/auth';
|
|
import AudioManager from '/imports/ui/services/audio-manager';
|
|
import Meetings from '/imports/api/meetings';
|
|
import { makeCall } from '/imports/ui/services/api';
|
|
import VoiceUsers from '/imports/api/voice-users';
|
|
import logger from '/imports/startup/client/logger';
|
|
|
|
const ROLE_MODERATOR = Meteor.settings.public.user.role_moderator;
|
|
|
|
const init = (messages, intl) => {
|
|
AudioManager.setAudioMessages(messages, intl);
|
|
if (AudioManager.initialized) return;
|
|
const meetingId = Auth.meetingID;
|
|
const userId = Auth.userID;
|
|
const { sessionToken } = Auth;
|
|
const User = Users.findOne({ userId }, { fields: { name: 1 } });
|
|
const username = User.name;
|
|
const Meeting = Meetings.findOne({ meetingId: Auth.meetingID }, { fields: { 'voiceProp.voiceConf': 1 } });
|
|
const voiceBridge = Meeting.voiceProp.voiceConf;
|
|
|
|
// FIX ME
|
|
const microphoneLockEnforced = false;
|
|
|
|
const userData = {
|
|
meetingId,
|
|
userId,
|
|
sessionToken,
|
|
username,
|
|
voiceBridge,
|
|
microphoneLockEnforced,
|
|
};
|
|
|
|
AudioManager.init(userData);
|
|
};
|
|
|
|
const isVoiceUser = () => {
|
|
const voiceUser = VoiceUsers.findOne({ intId: Auth.userID },
|
|
{ fields: { joined: 1 } });
|
|
return voiceUser ? voiceUser.joined : false;
|
|
};
|
|
|
|
const toggleMuteMicrophone = () => {
|
|
const user = VoiceUsers.findOne({
|
|
meetingId: Auth.meetingID, intId: Auth.userID,
|
|
}, { fields: { muted: 1 } });
|
|
|
|
if (user.muted) {
|
|
logger.info({
|
|
logCode: 'audiomanager_unmute_audio',
|
|
extraInfo: { logType: 'user_action' },
|
|
}, 'microphone unmuted by user');
|
|
makeCall('toggleVoice');
|
|
} else {
|
|
logger.info({
|
|
logCode: 'audiomanager_mute_audio',
|
|
extraInfo: { logType: 'user_action' },
|
|
}, 'microphone muted by user');
|
|
makeCall('toggleVoice');
|
|
}
|
|
};
|
|
|
|
export default {
|
|
init,
|
|
exitAudio: () => AudioManager.exitAudio(),
|
|
transferCall: () => AudioManager.transferCall(),
|
|
joinListenOnly: () => AudioManager.joinListenOnly(),
|
|
joinMicrophone: () => AudioManager.joinMicrophone(),
|
|
joinEchoTest: () => AudioManager.joinEchoTest(),
|
|
toggleMuteMicrophone,
|
|
changeInputDevice: inputDeviceId => AudioManager.changeInputDevice(inputDeviceId),
|
|
changeOutputDevice: outputDeviceId => AudioManager.changeOutputDevice(outputDeviceId),
|
|
isConnected: () => AudioManager.isConnected,
|
|
isTalking: () => AudioManager.isTalking,
|
|
isHangingUp: () => AudioManager.isHangingUp,
|
|
isUsingAudio: () => AudioManager.isUsingAudio(),
|
|
isWaitingPermissions: () => AudioManager.isWaitingPermissions,
|
|
isMuted: () => AudioManager.isMuted,
|
|
isConnecting: () => AudioManager.isConnecting,
|
|
isListenOnly: () => AudioManager.isListenOnly,
|
|
inputDeviceId: () => AudioManager.inputDeviceId,
|
|
outputDeviceId: () => AudioManager.outputDeviceId,
|
|
isEchoTest: () => AudioManager.isEchoTest,
|
|
error: () => AudioManager.error,
|
|
isUserModerator: () => Users.findOne({ userId: Auth.userID },
|
|
{ fields: { role: 1 } }).role === ROLE_MODERATOR,
|
|
isVoiceUser,
|
|
autoplayBlocked: () => AudioManager.autoplayBlocked,
|
|
handleAllowAutoplay: () => AudioManager.handleAllowAutoplay(),
|
|
playAlertSound: url => AudioManager.playAlertSound(url),
|
|
};
|