@@ -253,6 +253,7 @@ RES = \ | |||||
bin/resources/carla_config.py \ | bin/resources/carla_config.py \ | ||||
bin/resources/carla_database.py \ | bin/resources/carla_database.py \ | ||||
bin/resources/carla_host.py \ | bin/resources/carla_host.py \ | ||||
bin/resources/carla_patchbay.py \ | |||||
bin/resources/carla_rack.py \ | bin/resources/carla_rack.py \ | ||||
bin/resources/carla_settings.py \ | bin/resources/carla_settings.py \ | ||||
bin/resources/carla_skin.py \ | bin/resources/carla_skin.py \ | ||||
@@ -489,6 +490,7 @@ install: | |||||
# Install resources (main) | # Install resources (main) | ||||
install -m 755 \ | install -m 755 \ | ||||
bin/resources/carla-plugin \ | bin/resources/carla-plugin \ | ||||
bin/resources/carla-plugin-patchbay \ | |||||
bin/resources/*-ui \ | bin/resources/*-ui \ | ||||
$(DESTDIR)$(PREFIX)/share/carla/resources/ | $(DESTDIR)$(PREFIX)/share/carla/resources/ | ||||
@@ -505,6 +507,7 @@ install: | |||||
$(LINK) $(PREFIX)/share/carla/carla_config.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | $(LINK) $(PREFIX)/share/carla/carla_config.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | ||||
$(LINK) $(PREFIX)/share/carla/carla_database.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | $(LINK) $(PREFIX)/share/carla/carla_database.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | ||||
$(LINK) $(PREFIX)/share/carla/carla_host.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | $(LINK) $(PREFIX)/share/carla/carla_host.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | ||||
$(LINK) $(PREFIX)/share/carla/carla_patchbay.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | |||||
$(LINK) $(PREFIX)/share/carla/carla_rack.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | $(LINK) $(PREFIX)/share/carla/carla_rack.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | ||||
$(LINK) $(PREFIX)/share/carla/carla_settings.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | $(LINK) $(PREFIX)/share/carla/carla_settings.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | ||||
$(LINK) $(PREFIX)/share/carla/carla_skin.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | $(LINK) $(PREFIX)/share/carla/carla_skin.py $(DESTDIR)$(PREFIX)/share/carla/resources/ | ||||
@@ -1214,7 +1214,11 @@ protected: | |||||
return; | return; | ||||
CarlaString path(pHost->resourceDir); | CarlaString path(pHost->resourceDir); | ||||
path += "/carla-plugin"; | |||||
if (fIsPatchbay) | |||||
path += "/carla-plugin-patchbay"; | |||||
else | |||||
path += "/carla-plugin"; | |||||
carla_stdout("Trying to start carla-plugin using \"%s\"", path.buffer()); | carla_stdout("Trying to start carla-plugin using \"%s\"", path.buffer()); | ||||
@@ -1587,7 +1591,6 @@ static const NativePluginDescriptor carlaRackDesc = { | |||||
CarlaEngineNative::_dispatcher | CarlaEngineNative::_dispatcher | ||||
}; | }; | ||||
#if 0 | |||||
static const NativePluginDescriptor carlaPatchbayDesc = { | static const NativePluginDescriptor carlaPatchbayDesc = { | ||||
/* category */ ::PLUGIN_CATEGORY_OTHER, | /* category */ ::PLUGIN_CATEGORY_OTHER, | ||||
/* hints */ static_cast<NativePluginHints>(::PLUGIN_IS_SYNTH|::PLUGIN_HAS_UI|::PLUGIN_NEEDS_FIXED_BUFFERS|::PLUGIN_NEEDS_SINGLE_THREAD|::PLUGIN_USES_STATE|::PLUGIN_USES_TIME), | /* hints */ static_cast<NativePluginHints>(::PLUGIN_IS_SYNTH|::PLUGIN_HAS_UI|::PLUGIN_NEEDS_FIXED_BUFFERS|::PLUGIN_NEEDS_SINGLE_THREAD|::PLUGIN_USES_STATE|::PLUGIN_USES_TIME), | ||||
@@ -1625,7 +1628,6 @@ static const NativePluginDescriptor carlaPatchbayDesc = { | |||||
CarlaEngineNative::_set_state, | CarlaEngineNative::_set_state, | ||||
CarlaEngineNative::_dispatcher | CarlaEngineNative::_dispatcher | ||||
}; | }; | ||||
#endif | |||||
CARLA_BACKEND_END_NAMESPACE | CARLA_BACKEND_END_NAMESPACE | ||||
@@ -1638,9 +1640,7 @@ void carla_register_native_plugin_carla() | |||||
{ | { | ||||
CARLA_BACKEND_USE_NAMESPACE; | CARLA_BACKEND_USE_NAMESPACE; | ||||
carla_register_native_plugin(&carlaRackDesc); | carla_register_native_plugin(&carlaRackDesc); | ||||
#if 0 | |||||
carla_register_native_plugin(&carlaPatchbayDesc); | carla_register_native_plugin(&carlaPatchbayDesc); | ||||
#endif | |||||
} | } | ||||
// ----------------------------------------------------------------------- | // ----------------------------------------------------------------------- | ||||
@@ -520,7 +520,7 @@ class CarlaMiniW(ExternalUI, HostWindow): | |||||
ExternalUI.__init__(self) | ExternalUI.__init__(self) | ||||
HostWindow.__init__(self, None) | HostWindow.__init__(self, None) | ||||
if False: | |||||
if sys.argv[0].lower().endswith("/carla-plugin-patchbay"): | |||||
from carla_patchbay import CarlaPatchbayW | from carla_patchbay import CarlaPatchbayW | ||||
self.fContainer = CarlaPatchbayW(self) | self.fContainer = CarlaPatchbayW(self) | ||||
else: | else: | ||||
@@ -0,0 +1 @@ | |||||
carla-plugin |