Skip to content

Commit 5b22a12

Browse files
authored
Merge pull request #7973 from vector-im/yostyle/voicebroadcast_pause_playback
2 parents 64f9cfe + 64d116d commit 5b22a12

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

changelog.d/7830.misc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Pause voice broadcast listening on new VB recording

vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -626,13 +626,17 @@ class TimelineViewModel @AssistedInject constructor(
626626
viewModelScope.launch {
627627
when (action) {
628628
VoiceBroadcastAction.Recording.Start -> {
629+
voiceBroadcastHelper.pausePlayback()
629630
voiceBroadcastHelper.startVoiceBroadcast(room.roomId).fold(
630631
{ _viewEvents.post(RoomDetailViewEvents.ActionSuccess(action)) },
631632
{ _viewEvents.post(RoomDetailViewEvents.ActionFailure(action, it)) },
632633
)
633634
}
634635
VoiceBroadcastAction.Recording.Pause -> voiceBroadcastHelper.pauseVoiceBroadcast(room.roomId)
635-
VoiceBroadcastAction.Recording.Resume -> voiceBroadcastHelper.resumeVoiceBroadcast(room.roomId)
636+
VoiceBroadcastAction.Recording.Resume -> {
637+
voiceBroadcastHelper.pausePlayback()
638+
voiceBroadcastHelper.resumeVoiceBroadcast(room.roomId)
639+
}
636640
VoiceBroadcastAction.Recording.Stop -> _viewEvents.post(RoomDetailViewEvents.DisplayPromptToStopVoiceBroadcast)
637641
VoiceBroadcastAction.Recording.StopConfirmed -> voiceBroadcastHelper.stopVoiceBroadcast(room.roomId)
638642
is VoiceBroadcastAction.Listening.PlayOrResume -> voiceBroadcastHelper.playOrResumePlayback(action.voiceBroadcast)

0 commit comments

Comments
 (0)