Clean up a little

Author: lemcoder

app/src/nativeMain/kotlin/Main.kt

@@ -16,44 +16,44 @@ import platform.posix.sleep
 fun main() {
     val gOff = MidiMessageNoteOff(
         time = 10000,
-        channel = 5,
+        channel = 6,
         key = 32,
         next = null
     )
 
     val g = MidiMessageNoteOn(
         time = 2500,
-        channel = 5,
+        channel = 6,
         key = 43,
         velocity = 80,
         next = gOff
     )
 
     val eOff = MidiMessageNoteOff(
         time = 2000,
-        channel = 7,
+        channel = 3,
         key = 40,
         next = g
     )
 
     val e = MidiMessageNoteOn(
         time = 1_000,
-        channel = 7,
+        channel = 3,
         key = 40,
         velocity = 80,
         next = eOff
     )
 
     val cOff = MidiMessageNoteOff(
         time = 100,
-        channel = 1,
+        channel = 0,
         key = 36,
         next = e
     )
 
     val c = MidiMessageNoteOn(
         time = 0,
-        channel = 1,
+        channel = 0,
         key = 36,
         velocity = 80,
         next = cOff
@@ -64,11 +64,8 @@ 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)
 

core/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
     id("maven-publish")
@@ -23,7 +25,13 @@ kotlin {
         }
     }
 
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    compilerOptions {
+        freeCompilerArgs.add("-Xexpect-actual-classes")
+    }
+
     sourceSets {
+
         commonMain.dependencies {
             implementation(libs.coroutines.core)
         }

core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/Channel.kt

@@ -0,0 +1,119 @@
+package pl.lemanski.pandamidi.soundFont
+
+/**
+ * This class represents a channel on a soundfont.
+ */
+interface Channel {
+    /**
+     * The channel number
+     */
+
+    val number: Int
+
+    /**
+     * Set preset index >= 0 and < [preset count]
+     */
+    fun setPresetIndex(presetIndex: Int)
+
+    /**
+     * Set preset number (alternative to presetIndex)
+     */
+    fun setPresetNumber(presetNumber: Int, isMidiDrums: Boolean)
+
+    /**
+     * Set instrument bank number (alternative to presetIndex)
+     */
+    fun setBank(bank: Int)
+
+    /**
+     * Set instrument bank and preset number
+     */
+    fun setBankPreset(bank: Int, presetNumber: Int)
+
+    /**
+     * Set stereo panning value from 0.0 (left) to 1.0 (right) (default 0.5 center)
+     */
+    fun setPan(pan: Float)
+
+    /**
+     * Set linear volume scale factor (default 1.0 full)
+     */
+    fun setVolume(volume: Float)
+
+    /**
+     * Set pitch wheel position 0 to 16383 (default 8192 unpitched)
+     */
+    fun setPitchWheel(pitchWheel: Int)
+
+    /**
+     * Set range of the pitch wheel in semitones (default 2.0, total +/- 2 semitones)
+     */
+    fun setPitchRange(pitchRange: Float)
+
+    /**
+     * Set tuning of all playing voices in semitones (default 0.0, standard (A440) tuning)
+     */
+    fun setTuning(tuning: Float)
+
+
+    /**
+     * Start playing a note
+     */
+    fun noteOn(key: Int, velocity: Float)
+
+    /**
+     * Stop playing a note
+     */
+    fun noteOff(key: Int)
+
+    /**
+     * Stop playing all notes (end with sustain and release)
+     */
+    fun noteOffAll()
+
+    /**
+     * Stop playing all notes (end immediately)
+     */
+    fun soundsOffAll()
+
+
+    /**
+     * Get current preset index set on the channel
+     */
+    fun getPresetIndex(): Int
+
+    /**
+     * Get current instrument bank set on the channel
+     */
+    fun getPresetBank(): Int
+
+    /**
+     * Get current preset number set on the channel
+     */
+    fun getPresetNumber(): Int
+
+    /**
+     * Get current stereo panning value from 0.0 (left) to 1.0 (right)
+     */
+    fun getPan(): Float
+
+    /**
+     * Get current linear volume scale factor
+     */
+    fun getVolume(): Float
+
+    /**
+     * Get current pitch wheel position
+     */
+    fun getPitchWheel(): Int
+
+    /**
+     * Get current range of the pitch wheel in semitones
+     */
+    fun getPitchRange(): Float
+
+    /**
+     * Get current tuning of all playing voices in semitones
+     */
+    fun getTuning(): Float
+}

core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/SoundFont.kt

@@ -1,18 +1,7 @@
 package pl.lemanski.pandamidi.soundFont
 
 interface SoundFont {
-    /**
-     * Copy a tsf instance from an existing one, use tsf_close to close it as well.
-     * All copied tsf instances and their original instance are linked, and share the underlying soundfont.
-     * This allows loading a soundfont only once, but using it for multiple independent playbacks.
-     * (This function isn't thread-safe without locking.)
-     */
-    fun copy(): SoundFont
-
-    /**
-     * Free the memory related to this tsf instance
-     */
-    fun close()
+    val channels: List<Channel>
 
     /**
      * Stop all playing notes immediately and reset all channel parameters
@@ -114,7 +103,8 @@ interface SoundFont {
     fun setBankPreset(channel: Int, bank: Int, presetNumber: Int)
 
     /**
-     * Render output samples
+     * Render output samples in F32 format
+     * @param isMixing: if false clear the buffer first, otherwise mix into existing data
      */
     fun renderFloat(samples: Int, isMixing: Boolean): FloatArray
 

core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/SoundFontExt.kt

@@ -1,17 +1,5 @@
 package pl.lemanski.pandamidi.soundFont
 
-import pl.lemanski.pandamidi.soundFont.internal.SoundFontDelegate
+expect fun soundFont(path: String): SoundFont
 
-fun soundFont(path: String): SoundFont {
-    loadFromFile(path)
-    return object : SoundFont by SoundFontDelegate() { }
-}
-
-fun soundFont(memory: ByteArray): SoundFont {
-    loadFromMemory(memory)
-    return object : SoundFont by SoundFontDelegate() { }
-}
-
-internal expect fun loadFromFile(path: String)
-
-internal expect fun loadFromMemory(memory: ByteArray)
+expect fun soundFont(memory: ByteArray): SoundFont

core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/internal/ChannelDelegate.kt

@@ -0,0 +1,5 @@
+package pl.lemanski.pandamidi.soundFont.internal
+
+import pl.lemanski.pandamidi.soundFont.Channel
+
+internal expect class ChannelDelegate : Channel

core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontDelegate.kt

@@ -2,41 +2,4 @@ package pl.lemanski.pandamidi.soundFont.internal
 
 import pl.lemanski.pandamidi.soundFont.SoundFont
 
-internal open class SoundFontDelegate : SoundFont {
-
-    override fun copy(): SoundFont = SoundFontDelegate() // TODO implement
-
-    override fun close() = close(this)
-
-    override fun reset() = reset(this)
-
-    override fun getPresetIndex(bank: Int, presetNumber: Int): Int = getPresetIndex(this, bank, presetNumber)
-
-    override fun getPresetsCount(): Int = getPresetsCount(this)
-
-    override fun getPresetName(presetIndex: Int): String = getPresetName(this, presetIndex)
-
-    override fun bankGetPresetName(bank: Int, presetNumber: Int): String = bankGetPresetName(this, bank, presetNumber)
-
-    override fun setOutput(outputMode: SoundFont.OutputMode, sampleRate: Int, globalGainDb: Float) = setOutput(this, outputMode, sampleRate, globalGainDb)
-
-    override fun setVolume(globalGain: Float) = setVolume(this, globalGain)
-
-    override fun setMaxVoices(maxVoices: Int) = setMaxVoices(this, maxVoices)
-
-    override fun noteOn(presetIndex: Int, key: Int, velocity: Float) = noteOn(this, presetIndex, key, velocity)
-
-    override fun bankNoteOn(bank: Int, presetNumber: Int, key: Int, velocity: Float) = bankNoteOn(this, bank, presetNumber, key, velocity)
-
-    override fun noteOff(presetIndex: Int, key: Int) = noteOff(this, presetIndex, key)
-
-    override fun bankNoteOff(bank: Int, presetNumber: Int, key: Int) = bankNoteOff(this, bank, presetNumber, key)
-
-    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)
-}
+internal expect class SoundFontDelegate : SoundFont

core/src/commonMain/kotlin/pl/lemanski/pandamidi/soundFont/internal/SoundFontExtInternal.kt

@@ -1,18 +1,11 @@
 package pl.lemanski.pandamidi.soundFont
 
-import kotlinx.cinterop.ExperimentalForeignApi
-import kotlinx.cinterop.refTo
-import pl.lemanski.pandamidi.soundFont.internal.SoundFontHolder
-import tinySoundFont.tsf_load_filename
-import tinySoundFont.tsf_load_memory
+import pl.lemanski.pandamidi.soundFont.internal.SoundFontDelegate
 
-@OptIn(ExperimentalForeignApi::class)
-internal actual fun loadFromFile(path: String) {
-    SoundFontHolder.tsf = tsf_load_filename(path) ?: throw IllegalStateException("SoundFont not loaded")
-}
-
-@OptIn(ExperimentalForeignApi::class)
-internal actual fun loadFromMemory(memory: ByteArray) {
-    SoundFontHolder.tsf = tsf_load_memory(memory.refTo(0), memory.size) ?: throw IllegalStateException("SoundFont not loaded")
+actual fun soundFont(path: String): SoundFont {
+    return SoundFontDelegate(path)
 }
 
+actual fun soundFont(memory: ByteArray): SoundFont {
+    return SoundFontDelegate(memory)
+}