Update packages and remove app module

Author: lemcoder

app/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+    namespace = "pl.lemanski.mikroSoundFont.core"
     defaultConfig {
         compileSdk = libs.versions.android.compileSdk.get().toInt()
         minSdk = libs.versions.android.minSdk.get().toInt()
@@ -29,7 +30,7 @@ kotlin {
 
         commonMain.dependencies {
             implementation(libs.coroutines.core)
-            implementation(projects.tinySoundFont)
+            implementation(projects.lib)
         }
 
         commonTest.dependencies {

app/src/nativeMain/kotlin/Main.kt

@@ -1,7 +1,7 @@
 package pl.lemanski.pandamidi.generator
 
-import pl.lemanski.tinySoundFont.SoundFont
-import pl.lemanski.tinySoundFont.soundFont
+import pl.lemanski.mikroSoundFont.MikroSoundFont
+import pl.lemanski.mikroSoundFont.SoundFont
 
 internal object MinGWGenerator : Generator {
     private const val SAMPLE_RATE = 44100
@@ -10,7 +10,7 @@ internal object MinGWGenerator : Generator {
     private lateinit var soundFont: SoundFont
 
     override fun setSoundFont(path: String) {
-        soundFont = soundFont(path)
+        soundFont = MikroSoundFont.load(path)
         soundFont.setBankPreset(9, 128, 0)
         soundFont.setOutput(SoundFont.OutputMode.TSF_STEREO_INTERLEAVED, SAMPLE_RATE, 0.0f)
     }
@@ -38,7 +38,7 @@ internal object MinGWGenerator : Generator {
     private fun MidiMessage.process() {
         when (this) {
             is MidiMessageNoteOff -> soundFont.noteOff(channel, key)
-            is MidiMessageNoteOn  -> soundFont.noteOn(channel, key, velocity / 127.0f)
+            is MidiMessageNoteOn -> soundFont.noteOn(channel, key, velocity / 127.0f)
 
 //            is MidiMessageControlChange -> tsf_channel_midi_control(
 //                soundFont?.reinterpret(),
@@ -57,7 +57,7 @@ internal object MinGWGenerator : Generator {
 //                program.toInt(),
 //                (channel == 9u).toByte().toInt()
 //            )
-            else                  -> throw Exception("Unsupported command!")
+            else -> throw Exception("Unsupported command!")
         }
     }
 }

core/build.gradle.kts

@@ -10,11 +10,11 @@ plugins {
     id("pl.lemanski.plugin")
 }
 
-group = "pl.lemanski.tinySoundFont"
+group = "pl.lemanski.mikroSoundFont"
 version = "0.0.1"
 
 android {
-    namespace = "pl.lemanski.tinySoundFont"
+    namespace = "pl.lemanski.mikroSoundFont"
     defaultConfig {
         compileSdk = libs.versions.android.compileSdk.get().toInt()
         minSdk = libs.versions.android.minSdk.get().toInt()
@@ -28,6 +28,8 @@ android {
 }
 
 kotlin {
+    jvmToolchain(17)
+
     androidTarget().apply {
         publishAllLibraryVariants()
     }

core/src/commonMain/kotlin/pl/lemanski/pandamidi/io/audio/AudioPlayer.kt

@@ -5,7 +5,7 @@ project(core_native_lib)
 
 # Add the shared native library
 add_library(
-        tinySoundFontJNI                 # Name of the native library
+        mikroSoundFontJNI                 # Name of the native library
         SHARED
         ${CMAKE_SOURCE_DIR}/mikromidi.c
 )
@@ -23,6 +23,6 @@ find_library(
 
 # Link your native library against Android log library (or other required libraries)
 target_link_libraries(
-        tinySoundFontJNI
+        mikroSoundFontJNI
         ${log-lib}
 )

core/src/nativeMain/kotlin/pl/lemanski/pandamidi/generator/Generator.native.kt

@@ -8,30 +8,30 @@
 static struct tsf *g_tsf = NULL;
 
 // Function to reset the SoundFont (stop all notes, reset parameters)
-JNIEXPORT void JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_reset(JNIEnv *env, jobject obj) {
+JNIEXPORT void JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_reset(JNIEnv *env, jobject obj) {
     if (g_tsf) {
         tsf_reset(g_tsf);
     }
 }
 
 // Get preset index
-JNIEXPORT jint JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_getPresetIndex(JNIEnv *env, jobject obj, jint bank, jint presetNumber) {
+JNIEXPORT jint JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_getPresetIndex(JNIEnv *env, jobject obj, jint bank, jint presetNumber) {
     if (g_tsf) {
         return tsf_get_presetindex(g_tsf, bank, presetNumber);
     }
     return -1;
 }
 
 // Get number of presets
-JNIEXPORT jint JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_getPresetsCount(JNIEnv *env, jobject obj) {
+JNIEXPORT jint JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_getPresetsCount(JNIEnv *env, jobject obj) {
     if (g_tsf) {
         return tsf_get_presetcount(g_tsf);
     }
     return 0;
 }
 
 // Get the name of a preset by index
-JNIEXPORT jstring JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_getPresetName(JNIEnv *env, jobject obj, jint presetIndex) {
+JNIEXPORT jstring JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_getPresetName(JNIEnv *env, jobject obj, jint presetIndex) {
     if (g_tsf) {
         const char *name = tsf_get_presetname(g_tsf, presetIndex);
         return (*env)->NewStringUTF(env, name);
@@ -40,7 +40,7 @@ JNIEXPORT jstring JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontI
 }
 
 // Set output parameters
-JNIEXPORT void JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_setOutput(JNIEnv *env, jobject obj, jobject outputMode, jint sampleRate, jfloat globalGainDb) {
+JNIEXPORT void JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_setOutput(JNIEnv *env, jobject obj, jobject outputMode, jint sampleRate, jfloat globalGainDb) {
     if (g_tsf) {
         jclass outputModeClass = (*env)->GetObjectClass(env, outputMode);
 
@@ -61,35 +61,35 @@ JNIEXPORT void JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl
 }
 
 // Set volume
-JNIEXPORT void JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_setVolume(JNIEnv *env, jobject obj, jfloat globalGain) {
+JNIEXPORT void JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_setVolume(JNIEnv *env, jobject obj, jfloat globalGain) {
     if (g_tsf) {
         tsf_set_volume(g_tsf, globalGain);
     }
 }
 
 // Set max voices
-JNIEXPORT void JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_setMaxVoices(JNIEnv *env, jobject obj, jint maxVoices) {
+JNIEXPORT void JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_setMaxVoices(JNIEnv *env, jobject obj, jint maxVoices) {
     if (g_tsf) {
         tsf_set_max_voices(g_tsf, maxVoices);
     }
 }
 
 // Start playing a note
-JNIEXPORT void JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_noteOn(JNIEnv *env, jobject obj, jint presetIndex, jint key, jfloat velocity) {
+JNIEXPORT void JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_noteOn(JNIEnv *env, jobject obj, jint presetIndex, jint key, jfloat velocity) {
     if (g_tsf) {
         tsf_note_on(g_tsf, presetIndex, key, velocity);
     }
 }
 
 // Stop playing a note
-JNIEXPORT void JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_noteOff(JNIEnv *env, jobject obj, jint presetIndex, jint key) {
+JNIEXPORT void JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_noteOff(JNIEnv *env, jobject obj, jint presetIndex, jint key) {
     if (g_tsf) {
         tsf_note_off(g_tsf, presetIndex, key);
     }
 }
 
 // Render audio (this is a simplified example)
-JNIEXPORT jfloatArray JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_renderFloat(JNIEnv *env, jobject obj, jint samples, jboolean isMixing) {
+JNIEXPORT jfloatArray JNICALL Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_renderFloat(JNIEnv *env, jobject obj, jint samples, jboolean isMixing) {
     if (g_tsf) {
         float buffer[samples];
         tsf_render_float(g_tsf, buffer, samples, isMixing);
@@ -102,9 +102,9 @@ JNIEXPORT jfloatArray JNICALL Java_pl_lemanski_tinySoundFont_internal_TinySoundF
 }
 
 JNIEXPORT jboolean JNICALL
-Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_loadMemory(JNIEnv *env, jobject thiz, jbyteArray memory, jint size) {
+Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_loadMemory(JNIEnv *env, jobject thiz, jbyteArray memory, jint size) {
     // Get pointer to the memory array
-    jbyte* memoryBuffer = (*env)->GetByteArrayElements(env, memory, NULL);
+    jbyte *memoryBuffer = (*env)->GetByteArrayElements(env, memory, NULL);
 
     if (g_tsf) {
         tsf_close(g_tsf);  // Close the existing SoundFont if loaded
@@ -121,7 +121,7 @@ Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_loadMemory(JNIEnv *env
 }
 
 JNIEXPORT jboolean JNICALL
-Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_loadFilename(JNIEnv *env, jobject thiz, jstring path) {
+Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_loadFilename(JNIEnv *env, jobject thiz, jstring path) {
     // Convert the jstring path to a C-style string
     const char *filePath = (*env)->GetStringUTFChars(env, path, NULL);
 
@@ -140,45 +140,45 @@ Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_loadFilename(JNIEnv *e
 }
 
 JNIEXPORT void JNICALL
-Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_bankNoteOn(JNIEnv *env, jobject thiz, jint bank, jint preset_number, jint key, jfloat velocity) {
+Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_bankNoteOn(JNIEnv *env, jobject thiz, jint bank, jint preset_number, jint key, jfloat velocity) {
     if (g_tsf) {
         tsf_bank_note_on(g_tsf, bank, preset_number, key, velocity);
     }
 }
 
 JNIEXPORT void JNICALL
-Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_bankNoteOff(JNIEnv *env, jobject thiz, jint bank, jint preset_number, jint key) {
+Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_bankNoteOff(JNIEnv *env, jobject thiz, jint bank, jint preset_number, jint key) {
     if (g_tsf) {
         tsf_bank_note_off(g_tsf, bank, preset_number, key);
     }
 }
 
 JNIEXPORT void JNICALL
-Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_noteOffAll(JNIEnv *env, jobject thiz) {
+Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_noteOffAll(JNIEnv *env, jobject thiz) {
     if (g_tsf) {
         tsf_note_off_all(g_tsf);
     }
 }
 
 JNIEXPORT jint JNICALL
-Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_activeVoiceCount(JNIEnv *env, jobject thiz) {
+Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_activeVoiceCount(JNIEnv *env, jobject thiz) {
     if (g_tsf) {
         return tsf_active_voice_count(g_tsf);
     }
     return 0;  // Return 0 if no active SoundFont
 }
 
 JNIEXPORT void JNICALL
-Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_setBankPreset(JNIEnv *env, jobject thiz, jint channel, jint bank, jint preset_number) {
+Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_setBankPreset(JNIEnv *env, jobject thiz, jint channel, jint bank, jint preset_number) {
     if (g_tsf) {
         tsf_channel_set_bank_preset(g_tsf, channel, bank, preset_number);
     }
 }
 
 JNIEXPORT jstring JNICALL
-Java_pl_lemanski_tinySoundFont_internal_TinySoundFontImpl_bankGetPresetName(JNIEnv *env, jobject thiz, jint bank, jint preset_number) {
+Java_pl_lemanski_mikroSoundFont_internal_SoundFontDelegate_bankGetPresetName(JNIEnv *env, jobject thiz, jint bank, jint preset_number) {
     if (g_tsf) {
-        const char* presetName = tsf_bank_get_presetname(g_tsf, bank, preset_number);
+        const char *presetName = tsf_bank_get_presetname(g_tsf, bank, preset_number);
         if (presetName) {
             return (*env)->NewStringUTF(env, presetName);
         }

app/.gitignore renamed to lib/.gitignore

@@ -1,4 +1,4 @@
-package pl.lemanski.tinySoundFont
+package pl.lemanski.mikroSoundFont
 
 actual object MikroSoundFont {
     actual fun load(path: String): SoundFont {