WIP: midi device simulator

Author: xian

src/commonMain/kotlin/baaahs/ShowPlayer.kt

@@ -1,7 +1,11 @@
 package baaahs
 
+import baaahs.gl.GlContext
 import baaahs.gl.Toolchain
+import baaahs.gl.data.EngineFeedContext
 import baaahs.gl.data.FeedContext
+import baaahs.gl.data.ProgramFeedContext
+import baaahs.gl.glsl.GlslProgram
 import baaahs.gl.shader.OpenShader
 import baaahs.gl.withCache
 import baaahs.scene.SceneProvider
@@ -11,6 +15,9 @@ import baaahs.show.Show
 import baaahs.show.ShowState
 import baaahs.show.live.OpenShow
 import baaahs.show.live.ShowOpener
+import baaahs.util.Logger
+import baaahs.util.RefCounted
+import baaahs.util.RefCounter
 
 interface ShowPlayer {
     val toolchain: Toolchain
@@ -47,7 +54,19 @@ abstract class BaseShowPlayer(
         // TODO: This is another reference to feeds, so we should .use() it... but then we'll never release them!
         // TODO: Also, it could conceivably be handed out after it's had onRelease() called. How should we handle this?
         return feeds.getOrPut(feed) {
-            feed.open(this, id)
+            try {
+                feed.open(this, id)
+            } catch (e: Error) {
+                logger.error(e) { "Can't open feed $id" }
+
+                return object : FeedContext, RefCounted by RefCounter() {
+                    override fun bind(gl: GlContext): EngineFeedContext = object : EngineFeedContext {
+                        override fun bind(glslProgram: GlslProgram): ProgramFeedContext {
+                            return object : ProgramFeedContext {}
+                        }
+                    }
+                }
+            }
         }
     }
 
@@ -74,4 +93,8 @@ abstract class BaseShowPlayer(
             if (!openShader.inUse()) shaders.remove(shader)
         }
     }
+
+    companion object {
+        private val logger = Logger<BaseShowPlayer>()
+    }
 }

src/commonMain/kotlin/baaahs/di/Modules.kt

@@ -34,6 +34,7 @@ import baaahs.scene.SceneProvider
 import baaahs.sim.FakeDmxUniverse
 import baaahs.sim.FakeFs
 import baaahs.sim.FakeNetwork
+import baaahs.sim.SimulatorSettingsManager
 import baaahs.sm.brain.BrainManager
 import baaahs.sm.brain.FirmwareDaddy
 import baaahs.sm.brain.ProdBrainSimulator
@@ -195,6 +196,7 @@ interface SimulatorModule : KModule {
         single(named(Qualifier.MapperFs)) { FakeFs("Temporary Mapping Files") }
         single<Fs>(named(Qualifier.MapperFs)) { get<FakeFs>(named(Qualifier.MapperFs)) }
         single(named(WebClientModule.Qualifier.PinkyAddress)) { get<Network.Link>(named(Qualifier.PinkyLink)).myAddress }
+        single { SimulatorSettingsManager(get(named(Qualifier.PinkyFs))) }
     }
 
     enum class Qualifier {

src/commonMain/kotlin/baaahs/plugin/OpenPlugin.kt

@@ -14,6 +14,7 @@ import baaahs.show.FeedBuilder
 import baaahs.show.mutable.MutableControl
 import baaahs.show.mutable.MutableShow
 import baaahs.sim.BridgeClient
+import baaahs.sim.SimulatorSettingsManager
 import baaahs.ui.Icon
 import baaahs.util.Clock
 import kotlinx.cli.ArgParser
@@ -99,6 +100,14 @@ interface OpenSimulatorPlugin {
 
     /** This plugin is used on the client when running in the Simulator. */
     fun getClientPlugin(pluginContext: PluginContext): OpenClientPlugin
+
+    fun getHardwareSimulators(): List<HardwareSimulator> = emptyList()
+}
+
+interface HardwareSimulator {
+    val title: String
+
+    suspend fun start() {}
 }
 
 class SerializerRegistrar<T : Any>(val klass: KClass<T>, val serializer: KSerializer<T>) {
@@ -149,7 +158,7 @@ interface Plugin<T> {
  * client plugins via [#openForSimulator].
  */
 interface SimulatorPlugin {
-    fun openForSimulator(): OpenSimulatorPlugin
+    fun openForSimulator(simulatorSettingsManager: SimulatorSettingsManager): OpenSimulatorPlugin
 }
 
 class PluginContext(

src/commonMain/kotlin/baaahs/plugin/Plugins.kt

@@ -29,6 +29,7 @@ import baaahs.scene.MutableControllerConfig
 import baaahs.show.*
 import baaahs.show.mutable.MutableFeedPort
 import baaahs.sim.BridgeClient
+import baaahs.sim.SimulatorSettingsManager
 import baaahs.sm.brain.BrainControllerConfig
 import baaahs.sm.brain.BrainManager
 import baaahs.sm.server.PinkyArgs
@@ -108,18 +109,20 @@ class ClientPlugins : Plugins {
 }
 
 class SimulatorPlugins(
+    simulatorSettingsManager: SimulatorSettingsManager,
     private val bridgeClient: BridgeClient,
     plugins: List<Plugin<*>>
 ) {
     private val simulatorPlugins: List<OpenSimulatorPlugin>
     private var pluginsToSimulatorPlugins: List<Pair<Plugin<*>, OpenSimulatorPlugin?>>
+    lateinit var hardwareSimulators: List<HardwareSimulator>
 
     init {
         val forSimulator = mutableListOf<OpenSimulatorPlugin>()
 
         pluginsToSimulatorPlugins = plugins.map {
             it as Plugin<Any>
-            it to (it as? SimulatorPlugin)?.openForSimulator()
+            it to (it as? SimulatorPlugin)?.openForSimulator(simulatorSettingsManager)
         }
         simulatorPlugins = forSimulator
     }
@@ -148,6 +151,11 @@ class SimulatorPlugins(
             },
             pluginContext
         )
+
+    fun getHardwareSimulators() =
+        pluginsToSimulatorPlugins.flatMap { (plugin, simulatorPlugin) ->
+            simulatorPlugin?.getHardwareSimulators() ?: emptyList()
+        }
 }
 
 sealed class Plugins(
@@ -432,8 +440,12 @@ sealed class Plugins(
         fun buildForClient(pluginContext: PluginContext, plugins: List<Plugin<*>>): ClientPlugins =
             ClientPlugins(pluginContext, listOf(CorePlugin) + plugins)
 
-        fun buildForSimulator(bridgeClient: BridgeClient, plugins: List<Plugin<*>>): SimulatorPlugins =
-            SimulatorPlugins(bridgeClient, listOf(CorePlugin) + plugins)
+        fun buildForSimulator(
+            simulatorSettingsManager: SimulatorSettingsManager,
+            bridgeClient: BridgeClient,
+            plugins: List<Plugin<*>>
+        ): SimulatorPlugins =
+            SimulatorPlugins(simulatorSettingsManager, bridgeClient, listOf(CorePlugin) + plugins)
 
         fun safe(pluginContext: PluginContext): Plugins =
             SafePlugins(pluginContext, listOf(CorePlugin.openSafe(pluginContext)))

src/commonMain/kotlin/baaahs/plugin/beatlink/BeatLinkPlugin.kt

@@ -16,6 +16,7 @@ import baaahs.plugin.*
 import baaahs.show.Feed
 import baaahs.show.FeedBuilder
 import baaahs.sim.BridgeClient
+import baaahs.sim.SimulatorSettingsManager
 import baaahs.ui.Observable
 import baaahs.ui.addObserver
 import baaahs.util.Logger
@@ -275,7 +276,7 @@ class BeatLinkPlugin internal constructor(
         override fun openForClient(pluginContext: PluginContext): OpenClientPlugin =
             BeatLinkPlugin(PubSubSubscriber(pluginContext.pubSub), pluginContext)
 
-        override fun openForSimulator(): OpenSimulatorPlugin =
+        override fun openForSimulator(simulatorSettingsManager: SimulatorSettingsManager): OpenSimulatorPlugin =
             object : OpenSimulatorPlugin {
                 override fun getBridgePlugin(pluginContext: PluginContext): OpenBridgePlugin =
                     BeatLinkBridgePlugin(createServerBeatSource(pluginContext), pluginContext)

src/commonMain/kotlin/baaahs/plugin/midi/MidiData.kt

@@ -16,12 +16,26 @@ data class MidiData(
 
 
 interface MidiSource : IObservable {
+    val name: String
+
     fun getMidiData(): MidiData
 
     object None : Observable(), MidiSource {
-        val none = MidiData(0, 0)
+        override val name = "None"
+
+        private val none = MidiData(0, 0)
 
         override fun getMidiData(): MidiData = none
     }
 }
 
+interface MidiSystem : IObservable {
+    val midiSources: List<MidiSource>
+
+    suspend fun start() {}
+
+    object None : Observable(), MidiSystem {
+        override val midiSources: List<MidiSource>
+            get() = emptyList()
+    }
+}

src/commonMain/kotlin/baaahs/plugin/midi/MidiPlugin.kt

@@ -1,6 +1,5 @@
 package baaahs.plugin.midi
 
-import baaahs.PubSub
 import baaahs.ShowPlayer
 import baaahs.gl.GlContext
 import baaahs.gl.data.EngineFeedContext
@@ -14,8 +13,8 @@ import baaahs.plugin.*
 import baaahs.show.Feed
 import baaahs.show.FeedBuilder
 import baaahs.sim.BridgeClient
+import baaahs.sim.SimulatorSettingsManager
 import baaahs.ui.Observable
-import baaahs.ui.addObserver
 import baaahs.util.Logger
 import baaahs.util.RefCounted
 import baaahs.util.RefCounter
@@ -25,8 +24,10 @@ import kotlinx.cli.default
 import kotlinx.serialization.SerialName
 
 class MidiPlugin internal constructor(
-    internal val midiSource: MidiSource,
+    internal val midiSystem: MidiSystem,
 ) : OpenServerPlugin, OpenClientPlugin {
+    private val midiSource = midiSystem.midiSources.firstOrNull() ?: MidiSource.None
+
     override val packageName: String = MidiPlugin.id
     override val title: String = "Midi"
 
@@ -98,7 +99,6 @@ class MidiPlugin internal constructor(
 
     interface Args {
         val enableMidi: Boolean
-        val midiSource: MidiSource? get() = null
     }
 
     companion object : Plugin<Args>, SimulatorPlugin {
@@ -120,90 +120,52 @@ class MidiPlugin internal constructor(
         override fun getArgs(parser: ArgParser): Args = ParserArgs(parser)
 
         override fun openForServer(pluginContext: PluginContext, args: Args): OpenServerPlugin {
-            val midiSource = if (args.enableMidi) {
-                args.midiSource ?: createServerMidiSource(pluginContext)
-            } else MidiSource.None
-            return MidiPlugin(
-                PubSubPublisher(midiSource, pluginContext)
-            )
+            val midiSystem = if (args.enableMidi) {
+                createMidiSystem(pluginContext)
+            } else MidiSystem.None
+
+            return MidiPlugin(midiSystem)
         }
 
         override fun openForClient(pluginContext: PluginContext): OpenClientPlugin =
-            MidiPlugin(PubSubSubscriber(pluginContext.pubSub))
+            MidiPlugin(MidiSystem.None)
 
-        override fun openForSimulator(): OpenSimulatorPlugin =
+        override fun openForSimulator(
+            simulatorSettingsManager: SimulatorSettingsManager
+        ): OpenSimulatorPlugin =
             object : OpenSimulatorPlugin {
-                override fun getBridgePlugin(pluginContext: PluginContext): OpenBridgePlugin =
-                    MidiBridgePlugin(createServerMidiSource(pluginContext), pluginContext)
+                private val midiHardwareSimulator = MidiHardwareSimulator(simulatorSettingsManager)
+
+                override fun getBridgePlugin(pluginContext: PluginContext): OpenBridgePlugin? = null
 
                 override fun getServerPlugin(pluginContext: PluginContext, bridgeClient: BridgeClient) =
-                    MidiPlugin(
-                        PubSubPublisher(
-                            PubSubSubscriber(bridgeClient.pubSub, simulatorDefaultMidi),
-                            pluginContext
-                        )
-                    )
+                    MidiPlugin(midiHardwareSimulator)
 
                 override fun getClientPlugin(pluginContext: PluginContext): OpenClientPlugin =
                     openForClient(pluginContext)
-            }
-
-        private val midiDataTopic = PubSub.Topic("plugins/$id/midiData", MidiData.serializer())
-    }
-
-    /** Copy beat data from [midiSource] to a bridge PubSub channel. */
-    class MidiBridgePlugin(
-        private val midiSource: MidiSource,
-        pluginContext: PluginContext
-    ) : OpenBridgePlugin {
-        private val channel = pluginContext.pubSub.openChannel(midiDataTopic, unknownMidi) { }
-
-        init {
-            midiSource.addObserver { channel.onChange(it.getMidiData()) }
-        }
-    }
 
-    class PubSubPublisher(
-        midiSource: MidiSource,
-        pluginContext: PluginContext
-    ) : Observable(), MidiSource {
-        private var midiData: MidiData = midiSource.getMidiData()
-
-        val channel = pluginContext.pubSub.openChannel(midiDataTopic, midiData) {
-            logger.warn { "MidiData update from client? Huh?" }
-            midiData = it
-            notifyChanged()
-        }
-
-        init {
-            midiSource.addObserver {
-                val newMidiData = it.getMidiData()
-                midiData = newMidiData
-                notifyChanged()
-                channel.onChange(newMidiData)
+                override fun getHardwareSimulators(): List<HardwareSimulator> =
+                    listOf(midiHardwareSimulator)
             }
-        }
-
-        override fun getMidiData(): MidiData = midiData
-
     }
+}
 
-    class PubSubSubscriber(
-        pubSub: PubSub.Endpoint,
-        defaultMidiData: MidiData = unknownMidi
-    ) : Observable(), MidiSource {
-        private var midiData: MidiData = defaultMidiData
+class MidiHardwareSimulator(
+    private val simulatorSettingsManager: SimulatorSettingsManager
+) : HardwareSimulator, MidiSystem, Observable() {
+    override val title: String = "MIDI"
 
-        init {
-            pubSub.openChannel(midiDataTopic, midiData) {
-                midiData = it
-                notifyChanged()
-            }
-        }
+    override val midiSources: List<MidiSource>
+        get() = TODO("not implemented")
 
-        override fun getMidiData(): MidiData = midiData
+    override suspend fun start() {
+        logger.info { "Starting MIDI hardware simulator." }
+//        simulatorSettingsManager
+    }
 
+    companion object {
+        private val logger = Logger<MidiHardwareSimulator>()
     }
 }
 
-internal expect fun createServerMidiSource(pluginContext: PluginContext): MidiSource
+internal expect fun createMidiSystem(pluginContext: PluginContext): MidiSystem

src/commonMain/kotlin/baaahs/plugin/sound_analysis/SoundAnalysisPlugin.kt

@@ -17,6 +17,7 @@ import baaahs.show.Control
 import baaahs.show.Feed
 import baaahs.show.FeedBuilder
 import baaahs.sim.BridgeClient
+import baaahs.sim.SimulatorSettingsManager
 import baaahs.util.*
 import com.danielgergely.kgl.*
 import kotlinx.cli.ArgParser
@@ -106,7 +107,7 @@ class SoundAnalysisPlugin internal constructor(
             return SoundAnalysisPlugin(PubSubSubscriber(pluginContext.pubSub))
         }
 
-        override fun openForSimulator(): OpenSimulatorPlugin =
+        override fun openForSimulator(simulatorSettingsManager: SimulatorSettingsManager): OpenSimulatorPlugin =
             object : OpenSimulatorPlugin {
                 override fun getBridgePlugin(pluginContext: PluginContext): OpenBridgePlugin =
                     PubSubPublisher(createServerSoundAnalyzer(pluginContext), pluginContext)