Sync from next

gradle.properties

@@ -8,7 +8,7 @@ easyPluginVersion=0.13.0
 group=com.soywiz.korlibs.korau
 version=2.0.0-SNAPSHOT
 
-korioVersion=2.0.7
+korioVersion=2.0.8
 
 # bintray location
 project.bintray.org=korlibs

korau/src/commonMain/kotlin/com/soywiz/korau/internal/Coerce.kt

@@ -1,5 +1,7 @@
 package com.soywiz.korau.internal
 
+internal fun Float.coerceToShort(): Short = this.toInt().coerceToShort()
+
 internal fun Int.coerceToShort(): Short = this.coerceIn(Short.MIN_VALUE.toInt(), Short.MAX_VALUE.toInt()).toShort()
 internal fun Int.coerceToByte(): Byte = this.coerceIn(Byte.MIN_VALUE.toInt(), Byte.MAX_VALUE.toInt()).toByte()
 

korau/src/commonMain/kotlin/com/soywiz/korau/sound/AudioSamples.kt

@@ -1,5 +1,6 @@
 package com.soywiz.korau.sound
 
+import com.soywiz.kds.iterators.*
 import com.soywiz.kmem.*
 import com.soywiz.korau.internal.*
 import kotlin.math.*
@@ -78,8 +79,20 @@ class AudioSamples(override val channels: Int, override val totalSamples: Int, v
     override operator fun get(channel: Int, sample: Int): Short = data[channel][sample]
     override operator fun set(channel: Int, sample: Int, value: Short) = run { data[channel][sample] = value }
 
-    fun setTo(that: AudioSamples) {
+    fun scaleVolume(scale: Double): AudioSamples = scaleVolume(scale.toFloat())
+
+    fun scaleVolume(scale: Float): AudioSamples {
+        data.fastForEach { channel ->
+            for (n in channel.indices) {
+                channel[n] = (channel[n] * scale).toInt().coerceToShort()
+            }
+        }
+        return this
+    }
+
+    fun setTo(that: AudioSamples): AudioSamples {
         that.copyTo(this)
+        return this
     }
 
     fun copyTo(that: AudioSamples) {

korau/src/commonMain/kotlin/com/soywiz/korau/sound/Sound.kt

@@ -67,7 +67,9 @@ open class NativeSoundProvider {
     suspend fun playAndWait(stream: AudioStream, params: PlaybackParameters = PlaybackParameters.DEFAULT) = createStreamingSound(stream).playAndWait(params)
 }
 
-class DummyNativeSoundProvider : NativeSoundProvider()
+open class DummyNativeSoundProvider : NativeSoundProvider() {
+    companion object : DummyNativeSoundProvider()
+}
 
 class DummySoundChannel(sound: Sound, val data: AudioData? = null) : SoundChannel(sound) {
 	private var timeStart = DateTime.now()

korau/src/jvmMain/kotlin/com/soywiz/korau/sound/NativeSoundProviderJvm.kt

@@ -3,6 +3,7 @@ package com.soywiz.korau.sound
 import com.soywiz.korau.format.*
 import com.soywiz.korau.format.mp3.*
 import com.soywiz.korau.sound.impl.jna.*
+import com.soywiz.korio.time.*
 import java.util.*
 
 internal val nativeAudioFormats = AudioFormats(WAV, MP3Decoder, OGG) + AudioFormats(try {
@@ -12,6 +13,17 @@ internal val nativeAudioFormats = AudioFormats(WAV, MP3Decoder, OGG) + AudioForm
         listOf<AudioFormat>()
     })
 
-actual val nativeSoundProvider: NativeSoundProvider by lazy { JnaOpenALNativeSoundProvider() }
+actual val nativeSoundProvider: NativeSoundProvider by lazy {
+    try {
+        traceTime("OpenAL") {
+            JnaOpenALNativeSoundProvider()
+        }
+    } catch (e: UnsatisfiedLinkError) {
+        DummyNativeSoundProvider
+    } catch (e: Throwable) {
+        e.printStackTrace()
+        DummyNativeSoundProvider
+    }
+}
 //actual val nativeSoundProvider: NativeSoundProvider by lazy { JogampNativeSoundProvider() }
 //actual val nativeSoundProvider: NativeSoundProvider by lazy { AwtNativeSoundProvider() }