Added basic bindings for tiny sound font lib

lemcoder · lemcoder · commit a1ec4a746bb2 · 2024-08-11T15:20:18.000+02:00
diff --git a/app/src/nativeMain/kotlin/Main.kt b/app/src/nativeMain/kotlin/Main.kt
@@ -15,47 +15,47 @@ import platform.posix.sleep
 @OptIn(ExperimentalForeignApi::class)
 fun main() {
     val gOff = MidiMessageNoteOff(
-        time = 10000u,
-        channel = 5u,
-        key = 32u,
+        time = 10000,
+        channel = 5,
+        key = 32,
         next = null
     )
 
     val g = MidiMessageNoteOn(
-        time = 2500u,
-        channel = 5u,
-        key = 43u,
-        velocity = 80u,
+        time = 2500,
+        channel = 5,
+        key = 43,
+        velocity = 80,
         next = gOff
     )
 
     val eOff = MidiMessageNoteOff(
-        time = 2000u,
-        channel = 7u,
-        key = 40u,
+        time = 2000,
+        channel = 7,
+        key = 40,
         next = g
     )
 
     val e = MidiMessageNoteOn(
-        time = 1_000u,
-        channel = 7u,
-        key = 40u,
-        velocity = 80u,
+        time = 1_000,
+        channel = 7,
+        key = 40,
+        velocity = 80,
         next = eOff
     )
 
     val cOff = MidiMessageNoteOff(
-        time = 100u,
-        channel = 1u,
-        key = 36u,
+        time = 100,
+        channel = 1,
+        key = 36,
         next = e
     )
 
     val c = MidiMessageNoteOn(
-        time = 0u,
-        channel = 1u,
-        key = 36u,
-        velocity = 80u,
+        time = 0,
+        channel = 1,
+        key = 36,
+        velocity = 80,
         next = cOff
     )
 
@@ -64,8 +64,11 @@ fun main() {
 
     val soundFontPath = Path("D:\\src\\MidiWavConverter\\Example\\florestan-subset.sf2")
 
+    println("1")
     generator.setSoundFont(soundFontPath.toString())
+    println("2")
     val midiBytes = generator.generate(c)
+    println("3")
     val numSamples = midiBytes.size.toUInt() / sizeOf<FloatVar>().toUInt()
     val wavFileHeader = WavFileHeader.write(44100u, numSamples, 2u)
 
diff --git a/core/src/commonMain/kotlin/pl/lemanski/pandamidi/generator/MidiMessage.kt b/core/src/commonMain/kotlin/pl/lemanski/pandamidi/generator/MidiMessage.kt
@@ -1,30 +1,30 @@
 package pl.lemanski.pandamidi.generator
 
 sealed interface MidiMessage {
-    val time: UInt
-    val channel: UInt
+    val time: Int
+    val channel: Int
     val type: Type
     var next: MidiMessage?
 
-    enum class Type(val value: UInt) {
-        NOTE_OFF(0x80u),
-        NOTE_ON(0x90u),
-        KEY_PRESSURE(0xA0u),
-        CONTROL_CHANGE(0xB0u),
-        PROGRAM_CHANGE(0xC0u),
-        CHANNEL_PRESSURE(0xD0u),
-        PITCH_BEND(0xE0u),
-        SET_TEMPO(0x51u)
+    enum class Type(val value: Int) {
+        NOTE_OFF(0x80),
+        NOTE_ON(0x90),
+        KEY_PRESSURE(0xA0),
+        CONTROL_CHANGE(0xB0),
+        PROGRAM_CHANGE(0xC0),
+        CHANNEL_PRESSURE(0xD0),
+        PITCH_BEND(0xE0),
+        SET_TEMPO(0x51)
     }
 }
 
 // ---
 
 data class MidiMessageNoteOn(
-    override val time: UInt,
-    override val channel: UInt,
-    val key: UInt,
-    val velocity: UInt,
+    override val time: Int,
+    override val channel: Int,
+    val key: Int,
+    val velocity: Int,
     override var next: MidiMessage?,
 ) : MidiMessage {
     override val type: MidiMessage.Type = MidiMessage.Type.NOTE_ON
@@ -33,9 +33,9 @@ data class MidiMessageNoteOn(
 // ---
 
 data class MidiMessageNoteOff(
-    override val time: UInt,
-    override val channel: UInt,
-    val key: UInt,
+    override val time: Int,
+    override val channel: Int,
+    val key: Int,
     override var next: MidiMessage?,
 ) : MidiMessage {
     override val type: MidiMessage.Type = MidiMessage.Type.NOTE_OFF
@@ -44,9 +44,9 @@ data class MidiMessageNoteOff(
 // ---
 
 data class MidiMessageProgramChange(
-    override val time: UInt,
-    override val channel: UInt,
-    val program: UInt,
+    override val time: Int,
+    override val channel: Int,
+    val program: Int,
     override var next: MidiMessage?,
 ) : MidiMessage {
     override val type: MidiMessage.Type = MidiMessage.Type.PROGRAM_CHANGE
@@ -55,9 +55,9 @@ data class MidiMessageProgramChange(
 // ---
 
 data class MidiMessagePitchBend(
-    override val time: UInt,
-    override val channel: UInt,
-    val pitchBend: UInt,
+    override val time: Int,
+    override val channel: Int,
+    val pitchBend: Int,
     override var next: MidiMessage?,
 ) : MidiMessage {
     override val type: MidiMessage.Type = MidiMessage.Type.PITCH_BEND
@@ -66,10 +66,10 @@ data class MidiMessagePitchBend(
 // ---
 
 data class MidiMessageControlChange(
-    override val time: UInt,
-    override val channel: UInt,
-    val control: UInt,
-    val controlValue: UInt,
+    override val time: Int,
+    override val channel: Int,
+    val control: Int,
+    val controlValue: Int,
     override var next: MidiMessage?,
 ): MidiMessage {
     override val type: MidiMessage.Type = MidiMessage.Type.CONTROL_CHANGE
diff --git a/core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/SoundFont.kt b/core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/SoundFont.kt
@@ -108,6 +108,16 @@ interface SoundFont {
      */
     fun activeVoiceCount(): Int
 
+    /**
+     * Set up channel parameters
+     */
+    fun setBankPreset(channel: Int, bank: Int, presetNumber: Int)
+
+    /**
+     * Render output samples
+     */
+    fun renderFloat(samples: Int, isMixing: Boolean): FloatArray
+
     /**
      * Supported output modes by the render methods
      */
diff --git a/core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/SoundFontExt.kt b/core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/SoundFontExt.kt
@@ -2,18 +2,16 @@ package pl.lemanski.pandamidi.soundFont
 
 import pl.lemanski.pandamidi.soundFont.internal.SoundFontDelegate
 
-internal typealias Sf = Any
-
-fun SoundFont.load(path: String): SoundFont {
-    val soundFont = loadFromFile(path)
-    return object : SoundFont by SoundFontDelegate(soundFont) { }
+fun soundFont(path: String): SoundFont {
+    loadFromFile(path)
+    return object : SoundFont by SoundFontDelegate() { }
 }
 
-fun SoundFont.load(memory: ByteArray): SoundFont {
-    val soundFont = loadFromMemory(memory)
-    return object : SoundFont by SoundFontDelegate(soundFont) { }
+fun soundFont(memory: ByteArray): SoundFont {
+    loadFromMemory(memory)
+    return object : SoundFont by SoundFontDelegate() { }
 }
 
-internal expect fun loadFromFile(path: String): Sf
+internal expect fun loadFromFile(path: String)
 
-internal expect fun loadFromMemory(memory: ByteArray): Sf
+internal expect fun loadFromMemory(memory: ByteArray)
diff --git a/core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontDelegate.kt b/core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontDelegate.kt
@@ -1,11 +1,10 @@
 package pl.lemanski.pandamidi.soundFont.internal
 
-import pl.lemanski.pandamidi.soundFont.Sf
 import pl.lemanski.pandamidi.soundFont.SoundFont
 
-internal open class SoundFontDelegate(val sf: Sf) : SoundFont {
+internal open class SoundFontDelegate : SoundFont {
 
-    override fun copy(): SoundFont = SoundFontDelegate(sf)
+    override fun copy(): SoundFont = SoundFontDelegate() // TODO implement
 
     override fun close() = close(this)
 
@@ -36,4 +35,8 @@ internal open class SoundFontDelegate(val sf: Sf) : SoundFont {
     override fun noteOffAll() = noteOffAll(this)
 
     override fun activeVoiceCount(): Int = activeVoiceCount(this)
+
+    override fun setBankPreset(channel: Int, bank: Int, presetNumber: Int) = setBankPresetNumber(this, channel, bank, presetNumber)
+
+    override fun renderFloat(samples: Int, isMixing: Boolean): FloatArray = renderFloat(this, samples, isMixing)
 }
diff --git a/core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontExtInternal.kt b/core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontExtInternal.kt
@@ -30,4 +30,8 @@ internal expect fun bankNoteOff(delegate: SoundFontDelegate, bank: Int, presetNu
 
 internal expect fun noteOffAll(delegate: SoundFontDelegate)
 
-internal expect fun activeVoiceCount(delegate: SoundFontDelegate): Int
+internal expect fun activeVoiceCount(delegate: SoundFontDelegate): Int
+
+internal expect fun setBankPresetNumber(delegate: SoundFontDelegate, channel: Int, bank: Int, presetNumber: Int)
+
+internal expect fun renderFloat(delegate: SoundFontDelegate, samples: Int, isMixing: Boolean): FloatArray
diff --git a/core/src/mingwX64Main/kotlin/pl/lemanski/pandamidi/generator/Generator.mingwX64.kt b/core/src/mingwX64Main/kotlin/pl/lemanski/pandamidi/generator/Generator.mingwX64.kt
@@ -1,44 +1,21 @@
 package pl.lemanski.pandamidi.generator
 
-import kotlinx.cinterop.CPointer
-import kotlinx.cinterop.ExperimentalForeignApi
-import kotlinx.cinterop.refTo
-import kotlinx.cinterop.reinterpret
-import kotlinx.cinterop.toByte
-import tinySoundFont.TSFOutputMode
-import tinySoundFont.tsf_channel_midi_control
-import tinySoundFont.tsf_channel_note_off
-import tinySoundFont.tsf_channel_note_on
-import tinySoundFont.tsf_channel_set_bank_preset
-import tinySoundFont.tsf_channel_set_pitchwheel
-import tinySoundFont.tsf_channel_set_presetnumber
-import tinySoundFont.tsf_load_filename
-import tinySoundFont.tsf_render_float
-import tinySoundFont.tsf_set_output
+import pl.lemanski.pandamidi.soundFont.SoundFont
+import pl.lemanski.pandamidi.soundFont.soundFont
 
 internal object MinGWGenerator : Generator {
     private const val SAMPLE_RATE = 44100
     private const val CHANNEL_COUNT = 2
     private const val SAMPLE_BLOCK_SIZE = 410
+    private lateinit var soundFont: SoundFont
 
-    @OptIn(ExperimentalForeignApi::class)
-    private var soundFont: CPointer<*>? = null
-
-    @OptIn(ExperimentalForeignApi::class)
     override fun setSoundFont(path: String) {
-        soundFont = tsf_load_filename(path)
-        tsf_channel_set_bank_preset(soundFont?.reinterpret(), 9, 128, 0)
-        tsf_set_output(soundFont?.reinterpret(), TSFOutputMode.TSF_STEREO_INTERLEAVED, SAMPLE_RATE, 0.0f)
+        soundFont = soundFont(path)
+        soundFont.setBankPreset(9, 128, 0)
+        soundFont.setOutput(SoundFont.OutputMode.TSF_STEREO_INTERLEAVED, SAMPLE_RATE, 0.0f)
     }
 
-    @OptIn(ExperimentalForeignApi::class)
     override fun generate(midiMessage: MidiMessage): FloatArray {
-        if (soundFont == null) {
-            throw IllegalStateException("SoundFont not set")
-        }
-
-        val tmpBuffer = FloatArray(SAMPLE_BLOCK_SIZE * CHANNEL_COUNT)
-
         var currentTime = 0.0
         var audioBuffer = FloatArray(0)
         var message: MidiMessage? = midiMessage
@@ -51,50 +28,36 @@ internal object MinGWGenerator : Generator {
 
             while (targetTime >= currentTime) {
                 currentTime += SAMPLE_BLOCK_SIZE * (1000.0 / SAMPLE_RATE)
-                tsf_render_float(soundFont?.reinterpret(), tmpBuffer.refTo(0), SAMPLE_BLOCK_SIZE, 0)
-                audioBuffer += tmpBuffer
+                audioBuffer += soundFont.renderFloat(SAMPLE_BLOCK_SIZE, false)
             }
         }
 
         return audioBuffer
     }
 
-    @OptIn(ExperimentalForeignApi::class)
     private fun MidiMessage.process() {
-        if (soundFont == null) {
-            // TODO add logging
-            throw IllegalStateException("SoundFont not set")
-        }
-
         when (this) {
-            is MidiMessageControlChange -> tsf_channel_midi_control(
-                soundFont?.reinterpret(),
-                channel.toInt(),
-                control.toInt(),
-                controlValue.toInt()
-            )
-            is MidiMessageNoteOff       -> tsf_channel_note_off(
-                soundFont?.reinterpret(),
-                channel.toInt(),
-                key.toInt()
-            )
-            is MidiMessageNoteOn        -> tsf_channel_note_on(
-                soundFont?.reinterpret(),
-                channel.toInt(),
-                key.toInt(),
-                velocity.toFloat() / 127.0f
-            )
-            is MidiMessagePitchBend     -> tsf_channel_set_pitchwheel(
-                soundFont?.reinterpret(),
-                channel.toInt(),
-                pitchBend.toInt()
-            )
-            is MidiMessageProgramChange -> tsf_channel_set_presetnumber(
-                soundFont?.reinterpret(),
-                channel.toInt(),
-                program.toInt(),
-                (channel == 9u).toByte().toInt()
-            )
+            is MidiMessageNoteOff -> soundFont.noteOff(channel, key)
+            is MidiMessageNoteOn  -> soundFont.noteOn(channel, key, velocity / 127.0f)
+
+//            is MidiMessageControlChange -> tsf_channel_midi_control(
+//                soundFont?.reinterpret(),
+//                channel.toInt(),
+//                control.toInt(),
+//                controlValue.toInt()
+//            )
+//            is MidiMessagePitchBend     -> tsf_channel_set_pitchwheel(
+//                soundFont?.reinterpret(),
+//                channel.toInt(),
+//                pitchBend.toInt()
+//            )
+//            is MidiMessageProgramChange -> tsf_channel_set_presetnumber(
+//                soundFont?.reinterpret(),
+//                channel.toInt(),
+//                program.toInt(),
+//                (channel == 9u).toByte().toInt()
+//            )
+            else                  -> throw Exception("Unsupported command!")
         }
     }
 }
diff --git a/core/src/mingwX64Main/kotlin/pl/lemanski/pandamidi/soundFont/SoundFontExt.mingwX64.kt b/core/src/mingwX64Main/kotlin/pl/lemanski/pandamidi/soundFont/SoundFontExt.mingwX64.kt
diff --git a/core/src/mingwX64Main/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontExtInternal.mingwX64.kt b/core/src/mingwX64Main/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontExtInternal.mingwX64.kt
diff --git a/core/src/mingwX64Main/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontHolder.kt b/core/src/mingwX64Main/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontHolder.kt
