Skip to content

Commit 22eb030

Browse files
authored
Merge branch 'SlimeVR:main' into main
2 parents 0e1865e + dfba37e commit 22eb030

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

gui/src/sounds/sounds.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ function createAudio(path: string): HTMLAudioElement {
9797
export function restartAndPlay(audio: HTMLAudioElement | null, volume: number) {
9898
if (!audio) return;
9999
try {
100-
audio.load(); // LINUX: Solves wierd bug where webkit would unload sounds wierdly and make the sounds not play anymore
101-
102100
audio.volume = Math.min(1, Math.pow(volume, Math.E) + 0.05);
103101
audio.currentTime = 0;
104102
const playPromise = audio.play();

server/core/build.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,12 @@ dependencies {
7676
implementation("org.java-websocket:Java-WebSocket:1.+")
7777
implementation("com.melloware:jintellitype:1.+")
7878
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0")
79-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
80-
implementation("com.mayakapps.kache:kache:2.1.1")
79+
80+
// 2.1.1 - of kache cause OSCQuery to fail on android.
81+
// Same goes for upgrading coroutines. kache prob upgrade coroutines too.
82+
// proceed with caution if you plan on upgrading that library
83+
implementation("com.mayakapps.kache:kache:2.1.0")
84+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
8185

8286
api("com.github.loucass003:EspflashKotlin:v0.11.0")
8387

0 commit comments

Comments
 (0)