ZF/jitsi-meet
1
0
Fork 0
mirror of https://gitcode.com/GitHub_Trending/ji/jitsi-meet.git synced 2025-12-30 11:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(push2talk): incorect state on release because a new audio track is beening created. (part 2)

Browse Source
This commit is contained in:
Hristo Terezov
2024-07-23 16:57:44 -05:00
parent 3a40b52832
commit b242900619
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
conference.js
View File

@@ -705,11 +705,13 @@ export default {
/**
* Simulates toolbar button click for audio mute. Used by shortcuts and API.
*
* @param {boolean} mute true for mute and false for unmute.
* @param {boolean} [showUI] when set to false will not display any error
* dialogs in case of media permissions error.
* @returns {Promise}
*/
muteAudio(mute, showUI = true) {
async muteAudio(mute, showUI = true) {
const state = APP.store.getState();
if (!mute
@@ -749,7 +751,8 @@ export default {
};
APP.store.dispatch(gumPending([ MEDIA_TYPE.AUDIO ], IGUMPendingState.PENDING_UNMUTE));
createLocalTracksF({ devices: [ 'audio' ] })
await createLocalTracksF({ devices: [ 'audio' ] })
.then(([ audioTrack ]) => audioTrack)
.catch(error => {
maybeShowErrorDialog(error);
@@ -1277,8 +1280,7 @@ export default {
return;
}
APP.store.dispatch(
replaceLocalTrack(oldTrack, newTrack, room))
APP.store.dispatch(replaceLocalTrack(oldTrack, newTrack, room))
.then(() => {
this.updateAudioIconEnabled();
})

6
react/features/keyboard-shortcuts/actions.web.ts
View File

@@ -107,7 +107,8 @@ export const initKeyboardShortcuts = () =>
pttTimeout = window.setTimeout(() => {
sendAnalytics(createShortcutEvent('push.to.talk', ACTION_SHORTCUT_RELEASED));
logger.log('Talk shortcut released');
mutePromise = mutePromise.then(() => APP.conference.muteAudio(true));
mutePromise = mutePromise.then(() =>
APP.conference.muteAudio(true).catch(() => { /* nothing to be done */ }));
}, pttDelay);
}
@@ -131,7 +132,8 @@ export const initKeyboardShortcuts = () =>
clearTimeout(pttTimeout);
sendAnalytics(createShortcutEvent('push.to.talk', ACTION_SHORTCUT_PRESSED));
logger.log('Talk shortcut pressed');
mutePromise = mutePromise.then(() => APP.conference.muteAudio(false));
mutePromise = mutePromise.then(() =>
APP.conference.muteAudio(false).catch(() => { /* nothing to be done */ }));
} else if (key === 'ESCAPE') {
focusedElement?.blur();
}