From b8ed819c52759e446e56eab926778c3e14a0b39f Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 12 Oct 2014 11:47:08 +0100 Subject: [PATCH] Only show real LV2 instruments as synths; Cleanup --- source/carla_host.py | 10 +++++----- source/discovery/carla-discovery.cpp | 2 +- source/modules/lv2_rdf.hpp | 1 + source/widgets/racklistwidget.py | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/source/carla_host.py b/source/carla_host.py index 4f7ae04cb..552dccd95 100644 --- a/source/carla_host.py +++ b/source/carla_host.py @@ -68,7 +68,7 @@ NSM_URL = os.getenv("NSM_URL") # ------------------------------------------------------------------------------------------------------------ # Host Window -class HostWindow(QMainWindow, PluginEditParentMeta): +class HostWindow(QMainWindow): #class HostWindow(QMainWindow, PluginEditParentMeta, metaclass=PyQtMetaClass): # signals SIGTERM = pyqtSignal() @@ -1578,7 +1578,7 @@ class HostWindow(QMainWindow, PluginEditParentMeta): if pitem is None: return None #if False: - #pitem = CarlaRackItem(self, 0, False) + #return CarlaRackItem(self, 0, False) return pitem @@ -1589,8 +1589,8 @@ class HostWindow(QMainWindow, PluginEditParentMeta): pitem = self.fPluginList[pluginId] if pitem is None: return None - #if False: - #pitem = CarlaRackItem(self, 0, False) + if False: + return PluginEdit(self, self.host, 0) return pitem.getEditDialog() @@ -1602,7 +1602,7 @@ class HostWindow(QMainWindow, PluginEditParentMeta): if pitem is None: return None #if False: - #pitem = CarlaRackItem(self, 0, False) + #return AbstractPluginSlot() return pitem.getWidget() diff --git a/source/discovery/carla-discovery.cpp b/source/discovery/carla-discovery.cpp index 8b9f1a843..2cc78cb02 100644 --- a/source/discovery/carla-discovery.cpp +++ b/source/discovery/carla-discovery.cpp @@ -1112,7 +1112,7 @@ static void do_lv2_check(const char* const bundle, const bool doInit) } } - if (LV2_IS_GENERATOR(rdfDescriptor->Type[0], rdfDescriptor->Type[1])) + if (LV2_IS_INSTRUMENT(rdfDescriptor->Type[0], rdfDescriptor->Type[1])) hints |= PLUGIN_IS_SYNTH; if (rdfDescriptor->UICount > 0) diff --git a/source/modules/lv2_rdf.hpp b/source/modules/lv2_rdf.hpp index 54e59e479..74c4e81d3 100644 --- a/source/modules/lv2_rdf.hpp +++ b/source/modules/lv2_rdf.hpp @@ -291,6 +291,7 @@ typedef uint32_t LV2_Property; #define LV2_IS_EQ(x, y) ((x) & LV2_GROUP_EQ) #define LV2_IS_FILTER(x, y) ((x) & LV2_GROUP_FILTER) #define LV2_IS_GENERATOR(x, y) ((y) & LV2_GROUP_GENERATOR) +#define LV2_IS_INSTRUMENT(x, y) ((y) & LV2_PLUGIN_INSTRUMENT) #define LV2_IS_MODULATOR(x, y) ((y) & LV2_GROUP_MODULATOR) #define LV2_IS_REVERB(x, y) ((x) & LV2_GROUP_REVERB) #define LV2_IS_SIMULATOR(x, y) ((x) & LV2_GROUP_SIMULATOR) diff --git a/source/widgets/racklistwidget.py b/source/widgets/racklistwidget.py index 3e09bfd73..f381dc44a 100644 --- a/source/widgets/racklistwidget.py +++ b/source/widgets/racklistwidget.py @@ -49,10 +49,10 @@ class RackListItem(QListWidgetItem): if False: # kdevelop likes this :) - from carla_backend import CarlaHostMeta parent = RackListWidget() host = CarlaHostMeta() self.host = host + self.fWidget = AbstractPluginSlot() # ---------------------------------------------------------------------------------------------------- # Internal stuff @@ -103,7 +103,7 @@ class RackListItem(QListWidgetItem): self.fWidget = createPluginSlot(self.fParent, self.host, self.fPluginId, self.fUseSkins) self.fWidget.setFixedHeight(self.fWidget.getFixedHeight()) - self.setSizeHint(QSize(640, self.fWidget.getFixedHeight())) + self.setSizeHint(QSize(700, self.fWidget.getFixedHeight())) self.fParent.setItemWidget(self, self.fWidget)