vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-08 12:30:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

💥 Major refactor of initialization plumbing

Browse Source 
To account for the differences in VST2 plugins and VST3 modules we had
to wrap most of our old functions from `src/plugin/utils.h` in a new
`PluginInfo` struct that gathers all of this information while taking
into account the differences between VST2 and VST3 plugins.

With this change things are also a lot more organized. We can just query
the plugin information we need rather than having to store things
separately or having to recalculate things. This also moved the
responsibility of all the weird `WINEPREFIX` behaviour to a single place
instead of having it spread around `utils.pp`, the initialisation
message, and `host-procoess.cpp`.
This commit is contained in:
Robbert van der Helm
2020-12-04 18:13:52 +01:00
parent 0819e9fda9
commit c1e7f53cd0
11 changed files with 464 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugin/host-process.h
+10 -12
View File
@@ -41,12 +41,6 @@ class HostProcess {
public:
virtual ~HostProcess(){};
/**
* Return the architecture of the plugin we are loading, i.e. whether it is
* 32-bit or 64-bit.
*/
virtual LibArchitecture architecture() = 0;
/**
* Return the full path to the host application in use. The host application
* is chosen depending on the architecture of the plugin's DLL file and on
@@ -120,7 +114,9 @@ class IndividualHost : public HostProcess {
* handled on.
* @param logger The `Logger` instance the redirected STDIO streams will be
* written to.
* @param plugin_info The information about the plugin we should launch a
* @param plugin_info Information about the plugin we're going to use. Used
* to retrieve the Wine prefix and the plugin's architecture.
* @param host_request The information about the plugin we should launch a
* host process for. The values in the struct will be used as command line
* arguments.
*
@@ -129,15 +125,15 @@ class IndividualHost : public HostProcess {
*/
IndividualHost(boost::asio::io_context& io_context,
Logger& logger,
const HostRequest& plugin_info);
const PluginInfo& plugin_info,
const HostRequest& host_request);
LibArchitecture architecture() override;
boost::filesystem::path path() override;
bool running() override;
void terminate() override;
private:
LibArchitecture plugin_arch;
const PluginInfo& plugin_info;
boost::filesystem::path host_path;
boost::process::child host;
};
@@ -163,6 +159,8 @@ class GroupHost : public HostProcess {
* handled on.
* @param logger The `Logger` instance the redirected STDIO streams will be
* written to.
* @param plugin_info Information about the plugin we're going to use. Used
* to retrieve the Wine prefix and the plugin's architecture.
* @param host_request The information about the plugin we should launch a
* host process for. This object will be sent to the group host process.
* @param sockets The socket endpoints that will be used for communication
@@ -172,17 +170,17 @@ class GroupHost : public HostProcess {
*/
GroupHost(boost::asio::io_context& io_context,
Logger& logger,
const PluginInfo& plugin_info,
const HostRequest& host_request,
Sockets& socket_endpoint,
std::string group_name);
LibArchitecture architecture() override;
boost::filesystem::path path() override;
bool running() override;
void terminate() override;
private:
LibArchitecture plugin_arch;
const PluginInfo& plugin_info;
boost::filesystem::path host_path;
/**