mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-03 16:10:00 +00:00
Merge
This commit is contained in:
+1
@@ -266,4 +266,5 @@ class ExoPlayerForPreview(
|
||||
override fun setVideoCodecParameters(codecParameters: CodecParameters) {}
|
||||
override fun addVideoCodecParametersChangeListener(listener: CodecParametersChangeListener, keys: List<String>) {}
|
||||
override fun removeVideoCodecParametersChangeListener(listener: CodecParametersChangeListener) {}
|
||||
override fun setEnforceAdPlaybackOnTimelineRefresh(enforceAdPlaybackOnTimelineRefresh: Boolean) = throw NotImplementedError()
|
||||
}
|
||||
|
||||
+1
-1
@@ -92,7 +92,7 @@ class MediaViewerNode(
|
||||
is MediaViewerEntryPoint.Params.RoomMedia -> {
|
||||
val eventId = inputs.eventId
|
||||
if (eventId == null) {
|
||||
// Should not happen
|
||||
// Local echo, the viewer will not be focused on the item
|
||||
timelineMediaGalleryDataSource
|
||||
} else {
|
||||
// Can we use a specific timeline?
|
||||
|
||||
Reference in New Issue
Block a user