Skip to content
Snippets Groups Projects
Commit 9b1e2ffb authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Adds missing file from previous-2 commit

parent 54507fcf
No related branches found
No related tags found
No related merge requests found
...@@ -173,6 +173,9 @@ class BufferViewConfig constructor( ...@@ -173,6 +173,9 @@ class BufferViewConfig constructor(
fun minimumActivity() = _minimumActivity fun minimumActivity() = _minimumActivity
fun showSearch() = _showSearch fun showSearch() = _showSearch
fun buffers(): List<BufferId> = _buffers
fun removedBuffers(): Set<BufferId> = _removedBuffers
fun temporarilyRemovedBuffers(): Set<BufferId> = _temporarilyRemovedBuffers
override fun setAddNewBuffersAutomatically(addNewBuffersAutomatically: Boolean) { override fun setAddNewBuffersAutomatically(addNewBuffersAutomatically: Boolean) {
_addNewBuffersAutomatically = addNewBuffersAutomatically _addNewBuffersAutomatically = addNewBuffersAutomatically
...@@ -250,25 +253,25 @@ class BufferViewConfig constructor( ...@@ -250,25 +253,25 @@ class BufferViewConfig constructor(
private var _temporarilyRemovedBuffers: MutableSet<BufferId> = mutableSetOf() private var _temporarilyRemovedBuffers: MutableSet<BufferId> = mutableSetOf()
val live_config = BehaviorSubject.createDefault(this) val live_config = BehaviorSubject.createDefault(this)
val live_buffers: BehaviorSubject<List<BufferId>> val live_buffers: BehaviorSubject<List<BufferId>> = BehaviorSubject.createDefault<List<BufferId>>(
= BehaviorSubject.createDefault<List<BufferId>>(emptyList()) emptyList()
)
val live_removedBuffers: BehaviorSubject<Set<BufferId>> val live_removedBuffers: BehaviorSubject<Set<BufferId>> = BehaviorSubject.createDefault<Set<BufferId>>(
= BehaviorSubject.createDefault<Set<BufferId>>(emptySet()) emptySet()
)
val live_temporarilyRemovedBuffers: BehaviorSubject<Set<BufferId>> val live_temporarilyRemovedBuffers: BehaviorSubject<Set<BufferId>> = BehaviorSubject.createDefault<Set<BufferId>>(
= BehaviorSubject.createDefault<Set<BufferId>>(emptySet()) emptySet()
)
object NameComparator : Comparator<BufferViewConfig> { object NameComparator : Comparator<BufferViewConfig> {
override fun compare(a: BufferViewConfig?, b: BufferViewConfig?) override fun compare(a: BufferViewConfig?, b: BufferViewConfig?) =
= (a?.bufferViewName() ?: "").compareTo((b?.bufferViewName() ?: ""), true) (a?.bufferViewName() ?: "").compareTo((b?.bufferViewName() ?: ""), true)
} }
fun handleBuffer(info: BufferInfo, bufferSyncer: BufferSyncer) { fun requestAddBuffer(info: BufferInfo, bufferSyncer: BufferSyncer) {
if (_addNewBuffersAutomatically && if (!_buffers.contains(info.bufferId)) {
!_buffers.contains(info.bufferId) &&
!_temporarilyRemovedBuffers.contains(info.bufferId) &&
!_removedBuffers.contains(info.bufferId)) {
val position = if (_sortAlphabetically) { val position = if (_sortAlphabetically) {
val sortedBuffers = _buffers.mapNotNull { bufferSyncer.bufferInfo(it)?.bufferName } val sortedBuffers = _buffers.mapNotNull { bufferSyncer.bufferInfo(it)?.bufferName }
-sortedBuffers.binarySearch(info.bufferName) -sortedBuffers.binarySearch(info.bufferName)
...@@ -278,4 +281,13 @@ class BufferViewConfig constructor( ...@@ -278,4 +281,13 @@ class BufferViewConfig constructor(
requestAddBuffer(info.bufferId, position) requestAddBuffer(info.bufferId, position)
} }
} }
fun handleBuffer(info: BufferInfo, bufferSyncer: BufferSyncer) {
if (_addNewBuffersAutomatically &&
!_buffers.contains(info.bufferId) &&
!_temporarilyRemovedBuffers.contains(info.bufferId) &&
!_removedBuffers.contains(info.bufferId)) {
requestAddBuffer(info, bufferSyncer)
}
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment