-
-
Notifications
You must be signed in to change notification settings - Fork 650
Don't allow user to unmute if another user is speaking #2313
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
f28243e
Add maximum trasmit time for PTT
dbkr f5286a5
Don't allow user to unmute if another user is speaking
dbkr d5c62f1
Merge remote-tracking branch 'origin/dbkr/ptt' into dbkr/ptt_block_if…
dbkr 50d70c3
Merge remote-tracking branch 'origin/dbkr/ptt' into dbkr/ptt_block_if…
dbkr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -59,6 +59,12 @@ export class GroupCallError extends Error { | |
| } | ||
| } | ||
|
|
||
| export class OtherUserSpeakingError extends Error { | ||
| constructor() { | ||
| super("Cannot unmute: another user is speaking"); | ||
| } | ||
| } | ||
|
|
||
| export interface IGroupCallDataChannelOptions { | ||
| ordered: boolean; | ||
| maxPacketLifeTime: number; | ||
|
|
@@ -408,6 +414,12 @@ export class GroupCall extends EventEmitter { | |
|
|
||
| // set a timer for the maximum transmit time on PTT calls | ||
| if (this.isPtt) { | ||
| // if anoher user is currently unmuted, we can't unmute | ||
| if (!muted && this.userMediaFeeds.some(f => !f.isAudioMuted())) { | ||
| throw new OtherUserSpeakingError(); | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems susceptible to ping response time races? If multiple people unmute at the same time, they all would be allowed. |
||
|
|
||
| // Set or clear the max transmit timer | ||
| if (!muted && this.isMicrophoneMuted()) { | ||
| this.transmitTimer = setTimeout(() => { | ||
| this.setMicrophoneMuted(true); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems a bit weird to force on everyone.
If I was using this for game callouts, I would want to interrupt the other person.