Get rid of the dedicated AEffect socket

src/plugin/plugin-bridge.cpp

@@ -68,7 +68,6 @@ PluginBridge::PluginBridge(audioMasterCallback host_callback)
       vst_host_callback(io_context),
       host_vst_parameters(io_context),
       host_vst_process_replacing(io_context),
-      vst_host_aeffect(io_context),
       host_callback_function(host_callback),
       logger(Logger::create_from_environment(
           create_logger_prefix(socket_endpoint.path()))),
@@ -164,7 +163,6 @@ PluginBridge::PluginBridge(audioMasterCallback host_callback)
     socket_acceptor.accept(vst_host_callback);
     socket_acceptor.accept(host_vst_parameters);
     socket_acceptor.accept(host_vst_process_replacing);
-    socket_acceptor.accept(vst_host_aeffect);
     finished_accepting_sockets = true;
 
     // There's no need to keep the socket endpoint file around after accepting
@@ -220,9 +218,14 @@ PluginBridge::PluginBridge(audioMasterCallback host_callback)
     });
 
     // Read the plugin's information from the Wine process. This can only be
-    // done after we started accepting host callbacks as the plugin might do
-    // this during initialization.
-    const auto initialized_plugin = read_object<AEffect>(vst_host_aeffect);
+    // done after we started accepting host callbacks as the plugin will likely
+    // call these during its initialization. We reuse the `dispatcher()` socket
+    // for this since this has to be done only once.
+    const auto initialization_data =
+        read_object<EventResult>(host_vst_dispatch);
+    const auto initialized_plugin =
+        std::get<AEffect>(initialization_data.payload);
+
     update_aeffect(plugin, initialized_plugin);
 }
 

src/plugin/plugin-bridge.h

@@ -129,6 +129,12 @@ class PluginBridge {
     // instance the socket named `host_vst_dispatch` forwards
     // `AEffect.dispatch()` calls from the native VST host to the Windows VST
     // plugin (through the Wine VST host).
+
+    /**
+     * The socket that forwards all `dispatcher()` calls from the VST host to
+     * the plugin. This is also used once at startup to populate the values of
+     * the `AEffect` object.
+     */
     boost::asio::local::stream_protocol::socket host_vst_dispatch;
     /**
      * Used specifically for the `effProcessEvents` opcode. This is needed
@@ -145,13 +151,6 @@ class PluginBridge {
     boost::asio::local::stream_protocol::socket host_vst_parameters;
     boost::asio::local::stream_protocol::socket host_vst_process_replacing;
 
-    /**
-     * This socket only handles updates of the `AEffect` struct instead of
-     * passing through function calls. It's also used during initialization to
-     * pass the Wine plugin's information to the host.
-     */
-    boost::asio::local::stream_protocol::socket vst_host_aeffect;
-
     /**
      * Whether we're done accepting sockets. The plugin may hang indefinitely if
      * the Wine process fails to start, since then nothing will connect to our