Skip to content

Commit 838e11c

Browse files
author
Florian Renaud
committed
rename observeIncomingEvents method and reorder some methods
1 parent 62c574b commit 838e11c

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

vector/src/main/java/im/vector/app/features/voicebroadcast/listening/VoiceBroadcastPlayerImpl.kt

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -161,40 +161,15 @@ class VoiceBroadcastPlayerImpl @Inject constructor(
161161

162162
val voiceBroadcastState = getVoiceBroadcastUseCase.execute(roomId, eventId)?.content?.voiceBroadcastState
163163
isLive = voiceBroadcastState != null && voiceBroadcastState != VoiceBroadcastState.STOPPED
164-
observeIncomingEvents(roomId, eventId)
164+
fetchPlaylistAndStartPlayback(roomId, eventId)
165165
}
166166

167-
private fun startPlayback() {
168-
val event = if (isLive) playlist.lastOrNull() else playlist.firstOrNull()
169-
val content = event?.content ?: run { Timber.w("## VoiceBroadcastPlayer: No content to play"); return }
170-
val sequence = event.getVoiceBroadcastChunk()?.sequence
171-
coroutineScope.launch {
172-
try {
173-
currentMediaPlayer = prepareMediaPlayer(content)
174-
currentMediaPlayer?.start()
175-
currentVoiceBroadcastId?.let { playbackTracker.startPlayback(it) }
176-
currentSequence = sequence
177-
withContext(Dispatchers.Main) { playingState = State.PLAYING }
178-
nextMediaPlayer = prepareNextMediaPlayer()
179-
} catch (failure: Throwable) {
180-
Timber.e(failure, "Unable to start playback")
181-
throw VoiceFailure.UnableToPlay(failure)
182-
}
183-
}
184-
}
185-
186-
private fun observeIncomingEvents(roomId: String, voiceBroadcastId: String) {
167+
private fun fetchPlaylistAndStartPlayback(roomId: String, voiceBroadcastId: String) {
187168
fetchPlaylistJob = getLiveVoiceBroadcastChunksUseCase.execute(roomId, voiceBroadcastId)
188169
.onEach(this::updatePlaylist)
189170
.launchIn(coroutineScope)
190171
}
191172

192-
private fun resumePlayback() {
193-
currentMediaPlayer?.start()
194-
currentVoiceBroadcastId?.let { playbackTracker.startPlayback(it) }
195-
playingState = State.PLAYING
196-
}
197-
198173
private fun updatePlaylist(playlist: List<MessageAudioEvent>) {
199174
this.playlist = playlist.sortedBy { it.getVoiceBroadcastChunk()?.sequence?.toLong() ?: it.root.originServerTs }
200175
onPlaylistUpdated()
@@ -220,6 +195,31 @@ class VoiceBroadcastPlayerImpl @Inject constructor(
220195
}
221196
}
222197

198+
private fun startPlayback() {
199+
val event = if (isLive) playlist.lastOrNull() else playlist.firstOrNull()
200+
val content = event?.content ?: run { Timber.w("## VoiceBroadcastPlayer: No content to play"); return }
201+
val sequence = event.getVoiceBroadcastChunk()?.sequence
202+
coroutineScope.launch {
203+
try {
204+
currentMediaPlayer = prepareMediaPlayer(content)
205+
currentMediaPlayer?.start()
206+
currentVoiceBroadcastId?.let { playbackTracker.startPlayback(it) }
207+
currentSequence = sequence
208+
withContext(Dispatchers.Main) { playingState = State.PLAYING }
209+
nextMediaPlayer = prepareNextMediaPlayer()
210+
} catch (failure: Throwable) {
211+
Timber.e(failure, "Unable to start playback")
212+
throw VoiceFailure.UnableToPlay(failure)
213+
}
214+
}
215+
}
216+
217+
private fun resumePlayback() {
218+
currentMediaPlayer?.start()
219+
currentVoiceBroadcastId?.let { playbackTracker.startPlayback(it) }
220+
playingState = State.PLAYING
221+
}
222+
223223
private fun getNextAudioContent(): MessageAudioContent? {
224224
val nextSequence = currentSequence?.plus(1)
225225
?: playlist.lastOrNull()?.sequence

0 commit comments

Comments
 (0)