Misc fixing, cleanup

Makefile

@@ -247,11 +247,11 @@ install:
 	install -m 644 source/includes/CarlaDefines.h $(DESTDIR)$(PREFIX)/include/carla/includes/
 
 	# Install resources
-	install -m 755 source/modules/daz-plugins/resources/carla-plugin      $(DESTDIR)$(PREFIX)/lib/carla/resources/
-	install -m 755 source/modules/daz-plugins/resources/*-ui              $(DESTDIR)$(PREFIX)/lib/carla/resources/
-	install -m 644 source/modules/daz-plugins/resources/*.py              $(DESTDIR)$(PREFIX)/lib/carla/resources/
-	install -m 644 source/modules/daz-plugins/resources/nekofilter/*.png  $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/
-	install -m 644 source/modules/daz-plugins/resources/zynaddsubfx/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/
+	install -m 755 source/modules/native-plugins/resources/carla-plugin      $(DESTDIR)$(PREFIX)/lib/carla/resources/
+	install -m 755 source/modules/native-plugins/resources/*-ui              $(DESTDIR)$(PREFIX)/lib/carla/resources/
+	install -m 644 source/modules/native-plugins/resources/*.py              $(DESTDIR)$(PREFIX)/lib/carla/resources/
+	install -m 644 source/modules/native-plugins/resources/nekofilter/*.png  $(DESTDIR)$(PREFIX)/lib/carla/resources/nekofilter/
+	install -m 644 source/modules/native-plugins/resources/zynaddsubfx/*.png $(DESTDIR)$(PREFIX)/lib/carla/resources/zynaddsubfx/
 
 	# Install theme
 	$(MAKE) STYLES_DIR=$(DESTDIR)$(PREFIX)/lib/carla/styles install-main -C source/modules/theme

source/backend/standalone/CarlaStandalone.cpp

@@ -560,13 +560,23 @@ bool carla_engine_init_bridge(const char audioBaseName[6+1], const char controlB
     gStandalone.engine->setOption(CB::ENGINE_OPTION_PREFER_PLUGIN_BRIDGES, false, nullptr);
     gStandalone.engine->setOption(CB::ENGINE_OPTION_PREFER_UI_BRIDGES,     false, nullptr);
 
-    // TODO: get these from environment
-    gStandalone.engine->setOption(CB::ENGINE_OPTION_UIS_ALWAYS_ON_TOP,           gStandalone.engineOptions.uisAlwaysOnTop      ? 1 : 0,        nullptr);
-    gStandalone.engine->setOption(CB::ENGINE_OPTION_MAX_PARAMETERS,              static_cast<int>(gStandalone.engineOptions.maxParameters),    nullptr);
-    gStandalone.engine->setOption(CB::ENGINE_OPTION_UI_BRIDGES_TIMEOUT,          static_cast<int>(gStandalone.engineOptions.uiBridgesTimeout), nullptr);
-    gStandalone.engine->setOption(CB::ENGINE_OPTION_PATH_BINARIES,            0, (const char*)gStandalone.engineOptions.binaryDir);
-    gStandalone.engine->setOption(CB::ENGINE_OPTION_PATH_RESOURCES,           0, (const char*)gStandalone.engineOptions.resourceDir);
-    // frontend winId here
+    if (const char* const uisAlwaysOnTop = std::getenv("ENGINE_OPTION_UIS_ALWAYS_ON_TOP"))
+        gStandalone.engine->setOption(CB::ENGINE_OPTION_UIS_ALWAYS_ON_TOP,      (std::strcmp(uisAlwaysOnTop, "true") == 0) ? 1 : 0, nullptr);
+
+    if (const char* const maxParameters = std::getenv("ENGINE_OPTION_MAX_PARAMETERS"))
+        gStandalone.engine->setOption(CB::ENGINE_OPTION_MAX_PARAMETERS,          std::atoi(maxParameters), nullptr);
+
+    if (const char* const uiBridgesTimeout = std::getenv("ENGINE_OPTION_UI_BRIDGES_TIMEOUT"))
+        gStandalone.engine->setOption(CB::ENGINE_OPTION_UI_BRIDGES_TIMEOUT,      std::atoi(uiBridgesTimeout), nullptr);
+
+    if (const char* const binaryDir = std::getenv("ENGINE_OPTION_PATH_BINARIES"))
+        gStandalone.engine->setOption(CB::ENGINE_OPTION_PATH_BINARIES,        0, binaryDir);
+
+    if (const char* const resourceDir = std::getenv("ENGINE_OPTION_PATH_RESOURCES"))
+        gStandalone.engine->setOption(CB::ENGINE_OPTION_PATH_RESOURCES,       0, resourceDir);
+
+    if (const char* const frontendWinId = std::getenv("ENGINE_OPTION_FRONTEND_WIN_ID"))
+        gStandalone.engine->setOption(CB::ENGINE_OPTION_PATH_BINARIES,        0, frontendWinId);
 
     if (gStandalone.engine->init(clientName))
     {

source/bridges/CarlaBridgePlugin.cpp

@@ -167,17 +167,6 @@ public:
 
         carla_set_engine_callback(callback, this);
 
-#if 0
-        File curDir(File::getSpecialLocation(File::currentApplicationFile).getParentDirectory());
-
-        if (curDir.getChildFile("resources").exists())
-            carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("resources").getFullPathName().toRawUTF8());
-        else if (curDir.getChildFile("../../modules/native-plugins/resources").exists())
-            carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../../modules/native-plugins/resources").getFullPathName().toRawUTF8());
-        else
-            carla_set_engine_option(CarlaBackend::OPTION_PATH_RESOURCES, 0, curDir.getChildFile("../modules/native-plugins/resources").getFullPathName().toRawUTF8());
-#endif
-
         if (useBridge)
             carla_engine_init_bridge(audioBaseName, controlBaseName, clientName);
         else

source/carla_shared.py

@@ -556,7 +556,7 @@ def initHost(appName, libPrefix = None, failError = True):
     # -------------------------------------------------------------
     # Set resource path
 
-    localResources  = os.path.join(libfolder, "..", "modules", "daz-plugins", "resources")
+    localResources  = os.path.join(libfolder, "..", "modules", "native-plugins", "resources")
     systemResources = os.path.join(libfolder, "resources")
 
     if os.path.exists(localResources):

source/carla_widgets.py

@@ -142,7 +142,7 @@ class CarlaAboutW(QDialog):
 
             self.ui.l_ladspa.setText(self.tr("Everything! (Including LRDF)"))
             self.ui.l_dssi.setText(self.tr("Everything! (Including CustomData/Chunks)"))
-            self.ui.l_lv2.setText(self.tr("About 95&#37; complete (using custom extensions)<br/>"
+            self.ui.l_lv2.setText(self.tr("About 90&#37; complete (using custom extensions)<br/>"
                                           "Implemented Feature/Extensions:"
                                           "<ul>"
                                           "<li>http://lv2plug.in/ns/ext/atom</li>"

source/plugin/carla-native.lv2/resources

@@ -1 +1 @@
-../../modules/daz-plugins/resources
+../../modules/native-plugins/resources