diff --git a/external/rtmidi-javacpp b/external/rtmidi-javacpp index 71ec96be8..3b0ff54bb 160000 --- a/external/rtmidi-javacpp +++ b/external/rtmidi-javacpp @@ -1 +1 @@ -Subproject commit 71ec96be809a287c65c98743f76575119c107835 +Subproject commit 3b0ff54bb6a3f75ebbf636e34da8883c14fdee1b diff --git a/ktmidi-jvm-desktop/src/jvmMain/kotlin/dev/atsushieno/alsakt/AlsaSequencer.kt b/ktmidi-jvm-desktop/src/jvmMain/kotlin/dev/atsushieno/alsakt/AlsaSequencer.kt index 79656d534..0bf22c018 100644 --- a/ktmidi-jvm-desktop/src/jvmMain/kotlin/dev/atsushieno/alsakt/AlsaSequencer.kt +++ b/ktmidi-jvm-desktop/src/jvmMain/kotlin/dev/atsushieno/alsakt/AlsaSequencer.kt @@ -420,22 +420,9 @@ class AlsaSequencer( const val QueueDirect = 253 - private val config: snd_config_t - - val DEFAULT_ALSA_CONF_PATHS = "/usr/local/share/alsa/alsa.conf:/usr/share/alsa/alsa.conf" - val ALSA_CONF_PATHS = System.getenv("ALSAKT_CONFIG_PATH") - ?: System.getenv("ALSA_CONFIG_PATH") - ?: DEFAULT_ALSA_CONF_PATHS - init { Loader.load(snd_seq_t::class.java) // FIXME: this should not be required... - val cfg = snd_config_t() - Alsa.snd_config_top(cfg) - val upd = snd_config_update_t() - Alsa.snd_config_update_r(cfg, upd, ALSA_CONF_PATHS) - config = cfg - seq_evt_size = sizeof(snd_seq_event_t::class.java) seq_evt_off_source_port = snd_seq_event_t.offsetof(snd_seq_event_t::class.java, "source") + @@ -452,7 +439,7 @@ class AlsaSequencer( init { val ptr = snd_seq_t() - val err = Alsa.snd_seq_open_lconf(ptr, driverName, ioType, ioMode, config) + val err = Alsa.snd_seq_open(ptr, driverName, ioType, ioMode) if (err != 0) throw AlsaException(err) seq = ptr