OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6728 from matrix-org/travis/voice-messages/interrupt-text 

Stop automatic playback of voice messages if a non-voice message is encountered
pull/21833/head
Travis Ralston 2021-09-03 13:34:58 -06:00 committed by GitHub
parent 60e2d61d25 b2cb944d73
commit 9dee3eb0e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/audio/PlaybackQueue.ts
View File

@ -22,6 +22,7 @@ import { arrayFastClone } from "../utils/arrays";
import { PlaybackManager } from "./PlaybackManager"; import { PlaybackManager } from "./PlaybackManager";
import { isVoiceMessage } from "../utils/EventUtils"; import { isVoiceMessage } from "../utils/EventUtils";
import RoomViewStore from "../stores/RoomViewStore"; import RoomViewStore from "../stores/RoomViewStore";
import { EventType } from "matrix-js-sdk/src/@types/event";
/** /**
* Audio playback queue management for a given room. This keeps track of where the user * Audio playback queue management for a given room. This keeps track of where the user
@ -137,13 +138,17 @@ export class PlaybackQueue {
} }
if (!scanForVoiceMessage) continue; if (!scanForVoiceMessage) continue;
// Dev note: This is where we'd break to cause text/non-voice messages to if (!isVoiceMessage(event)) {
// interrupt automatic playback. const evType = event.getType();
if (evType !== EventType.RoomMessage && evType !== EventType.Sticker) {
continue; // Event can be skipped for automatic playback consideration
}
break; // Stop automatic playback: next useful event is not a voice message
}
const isRightType = isVoiceMessage(event);
const havePlayback = this.playbacks.has(event.getId()); const havePlayback = this.playbacks.has(event.getId());
const isRecentlyCompleted = this.recentFullPlays.has(event.getId()); const isRecentlyCompleted = this.recentFullPlays.has(event.getId());
if (isRightType && havePlayback && !isRecentlyCompleted) { if (havePlayback && !isRecentlyCompleted) {
nextEv = event; nextEv = event;
break; break;
} }