Skip to content

Commit 1e77adc

Browse files
NikkyAINikkyAI
committed
prevent min and max values of lumakey to be flipped
update dependencies
1 parent 041f03d commit 1e77adc

8 files changed

Lines changed: 72 additions & 33 deletions

File tree

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ kotlin {
7070
implementation(Kotlin.stdlib.common)
7171

7272
implementation(KotlinX.coroutines.core)
73+
// implementation(KotlinX.coroutines.slf4j)
7374
// explicit include to fix proguard warning
7475
implementation(KotlinX.serialization.core)
7576
implementation(KotlinX.serialization.json)

‎gradle/wrapper/gradle-wrapper.jar‎

1.83 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎gradlew‎

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/desktopMain/kotlin/nestdrop/NestdropControl.kt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import kotlinx.coroutines.flow.onEach
1111
import osc.OSCMessage
1212
import osc.OscSynced
1313
import osc.nestdropSendChannel
14+
import kotlin.math.max
15+
import kotlin.math.min
1416
import kotlin.math.roundToInt
1517

1618
@OptIn(ExperimentalForInheritanceCoroutinesApi::class)
@@ -226,6 +228,8 @@ sealed interface NestdropControl {
226228

227229
override suspend fun startFlows() {
228230
combine(minState, maxState) { min, max ->
231+
val min = min(min, max)
232+
val max = max(min, max)
229233
min.coerceIn(range.start, range.endInclusive) to max.coerceIn(range.start, range.endInclusive)
230234
}
231235
.onEach { (minValue, maxValue) ->

‎src/desktopMain/kotlin/nestdrop/NestdropSpriteQueue.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ sealed interface PresetIdState {
2828

2929

3030
class NestdropSpriteQueue(
31-
private val nestdropSendChannel: Channel<OSCPacket>,
31+
private val sendChannel: Channel<OSCPacket>,
3232
private val spoutStateMap: StateFlow<Map<String, Deck.SpriteKey>>,
3333
private val queue: StateFlow<Queue<out Preset>?>,
3434
private val matchFx: Boolean = true,
@@ -52,7 +52,7 @@ class NestdropSpriteQueue(
5252
}
5353
logger.debug { "setting index $index on ${queue.name} (/Queue/${queue.name}/ActIdx/$index)" }
5454
// logger.debug { "setting presetId $index on ${queue.name} (\"/PresetID/${queue.name}/$id\")" }
55-
nestdropSendChannel.send(
55+
sendChannel.send(
5656
OSCMessage(
5757
// /PresetID/spout_1/15879 or /Queue/spout_1/ActIdx/0
5858
"/Queue/${queue.name}/ActIdx/$index",

‎versions.properties‎

Lines changed: 57 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,34 @@
77
#### suppress inspection "SpellCheckingInspection" for whole file
88
#### suppress inspection "UnusedProperty" for whole file
99

10-
plugin.org.jetbrains.compose=1.8.2
11-
## # available=1.9.0-alpha01
12-
## # available=1.9.0-alpha02
13-
## # available=1.9.0-alpha03
14-
## # available=1.9.0-beta01
15-
## # available=1.9.0-beta02
16-
## # available=1.9.0-beta03
17-
## # available=1.9.0-rc01
10+
plugin.org.jetbrains.compose=1.9.3
11+
## # available=1.10.0-alpha01
12+
## # available=1.10.0-alpha02
13+
## # available=1.10.0-alpha03
14+
## # available=1.10.0-beta01
15+
## # available=1.10.0-beta02
16+
## # available=1.10.0-rc01
17+
## # available=1.10.0-rc02
18+
## # available=1.11.0-alpha01
1819

1920
plugin.dev.reformator.stacktracedecoroutinator=2.5.7
21+
## # available=2.5.8
22+
## # available=2.5.9
23+
## # available=2.6.0
24+
## # available=2.6.1
2025

2126
version.ch.qos.logback..logback-classic=1.5.18
27+
## # available=1.5.19
28+
## # available=1.5.20
29+
## # available=1.5.21
30+
## # available=1.5.22
31+
## # available=1.5.23
32+
## # available=1.5.24
2233

2334
version.com.akuleshov7..ktoml-core=0.7.1
2435

2536
version.com.github.doyaaaaaken..kotlin-csv-jvm=1.10.0
2637

27-
version.com.mohamedrejeb.calf..calf-permissions=0.8.0
28-
2938
version.io.github.cdimascio..dotenv-kotlin=6.5.1
3039

3140
version.io.github.kdroidfilter..platformtools.appmanager=0.3.3
@@ -35,6 +44,12 @@ version.io.github.kdroidfilter..platformtools.appmanager=0.3.3
3544
## # available=0.5.0
3645
## # available=0.6.0
3746
## # available=0.6.1
47+
## # available=0.6.2
48+
## # available=0.7.0
49+
## # available=0.7.1
50+
## # available=0.7.2
51+
## # available=0.7.3
52+
## # available=0.7.4
3853

3954
version.io.github.kdroidfilter..platformtools.core=0.3.3
4055
## # available=0.3.4
@@ -43,6 +58,12 @@ version.io.github.kdroidfilter..platformtools.core=0.3.3
4358
## # available=0.5.0
4459
## # available=0.6.0
4560
## # available=0.6.1
61+
## # available=0.6.2
62+
## # available=0.7.0
63+
## # available=0.7.1
64+
## # available=0.7.2
65+
## # available=0.7.3
66+
## # available=0.7.4
4667

4768
version.io.github.kdroidfilter..platformtools.darkmodedetector=0.3.3
4869
## # available=0.3.4
@@ -51,7 +72,14 @@ version.io.github.kdroidfilter..platformtools.darkmodedetector=0.3.3
5172
## # available=0.5.0
5273
## # available=0.6.0
5374
## # available=0.6.1
54-
75+
## # available=0.6.2
76+
## # available=0.7.0
77+
## # available=0.7.1
78+
## # available=0.7.2
79+
## # available=0.7.3
80+
## # available=0.7.4
81+
82+
## unused
5583
version.io.github.kdroidfilter..platformtools.permissionhandler=0.3.3
5684
## # available=0.3.4
5785
## # available=0.3.5
@@ -63,19 +91,28 @@ version.io.github.kdroidfilter..platformtools.releasefetcher=0.3.3
6391
## # available=0.5.0
6492
## # available=0.6.0
6593
## # available=0.6.1
94+
## # available=0.6.2
95+
## # available=0.7.0
96+
## # available=0.7.1
97+
## # available=0.7.2
98+
## # available=0.7.3
99+
## # available=0.7.4
66100

67-
version.io.projectreactor.tools..blockhound=1.0.13.RELEASE
101+
version.io.projectreactor.tools..blockhound=1.0.15.RELEASE
68102

69-
version.kotlin=2.2.10
70-
## # available=2.2.20-Beta1
71-
## # available=2.2.20-Beta2
72-
## # available=2.2.20-RC
103+
version.kotlin=2.3.0
104+
## # available=2.3.20-Beta1
73105

74106
version.com.illposed.osc..javaosc-core=0.9
75107

76-
version.io.github.oshai..kotlin-logging=7.0.13
108+
version.io.github.oshai..kotlin-logging=7.0.14
109+
## # available=8.0.00-beta-01
110+
## # available=8.0.00-beta-02
111+
## # available=8.0.00-beta-03
112+
## # available=8.0.00-beta-04
77113

78-
version.io.github.pdvrieze.xmlutil..serialization=0.91.2
114+
version.io.github.pdvrieze.xmlutil..serialization=0.91.3
115+
## # available=1.0.0-rc1
79116

80117
version.io.github.xn32..json5k=0.3.0
81118

@@ -84,8 +121,6 @@ version.kotlinx.coroutines=1.10.2
84121
version.kotlinx.datetime=0.7.1-0.6.x-compat
85122

86123
version.kotlinx.serialization=1.9.0
124+
## # available=1.10.0-RC
87125

88-
version.ktor=3.2.0
89-
### available=3.2.1
90-
### available=3.2.2
91-
### available=3.2.3
126+
version.ktor=3.3.3

0 commit comments

Comments
 (0)