Browse Source

More cleanup

tags/1.9.5
falkTX 11 years ago
parent
commit
0ead97f727
3 changed files with 16 additions and 33 deletions
  1. +0
    -17
      source/carla
  2. +12
    -12
      source/carla_patchbay.py
  3. +4
    -4
      source/carla_rack.py

+ 0
- 17
source/carla View File

@@ -93,23 +93,6 @@ class CarlaMultiW(QTabWidget):

parent.ui.act_settings_configure.triggered.connect(self.fPatchbay.slot_configureCarla)

host.PluginAddedCallback.connect(self.fRack.slot_handlePluginAddedCallback)
host.PluginAddedCallback.connect(self.fPatchbay.slot_handlePluginAddedCallback)
host.PluginRemovedCallback.connect(self.fRack.slot_handlePluginRemovedCallback)
host.PluginRemovedCallback.connect(self.fPatchbay.slot_handlePluginRemovedCallback)

host.ReloadAllCallback.connect(self.fRack.slot_handleReloadAllCallback)

host.PatchbayClientAddedCallback.connect(self.fPatchbay.slot_handlePatchbayClientAddedCallback)
host.PatchbayClientRemovedCallback.connect(self.fPatchbay.slot_handlePatchbayClientRemovedCallback)
host.PatchbayClientRenamedCallback.connect(self.fPatchbay.slot_handlePatchbayClientRenamedCallback)
host.PatchbayClientDataChangedCallback.connect(self.fPatchbay.slot_handlePatchbayClientDataChangedCallback)
host.PatchbayPortAddedCallback.connect(self.fPatchbay.slot_handlePatchbayPortAddedCallback)
host.PatchbayPortRemovedCallback.connect(self.fPatchbay.slot_handlePatchbayPortRemovedCallback)
host.PatchbayPortRenamedCallback.connect(self.fPatchbay.slot_handlePatchbayPortRenamedCallback)
host.PatchbayConnectionAddedCallback.connect(self.fPatchbay.slot_handlePatchbayConnectionAddedCallback)
host.PatchbayConnectionRemovedCallback.connect(self.fPatchbay.slot_handlePatchbayConnectionRemovedCallback)

# -----------------------------------------------------------------

def fixCanvasPreviewSize(self):


+ 12
- 12
source/carla_patchbay.py View File

@@ -206,6 +206,18 @@ class CarlaPatchbayW(QFrame, PluginEditParentMeta):
# -------------------------------------------------------------
# Connect actions to functions (part 2)

host.PluginAddedCallback.connect(self.slot_handlePluginAddedCallback)
host.PluginRemovedCallback.connect(self.slot_handlePluginRemovedCallback)
host.PatchbayClientAddedCallback.connect(self.slot_handlePatchbayClientAddedCallback)
host.PatchbayClientRemovedCallback.connect(self.slot_handlePatchbayClientRemovedCallback)
host.PatchbayClientRenamedCallback.connect(self.slot_handlePatchbayClientRenamedCallback)
host.PatchbayClientDataChangedCallback.connect(self.slot_handlePatchbayClientDataChangedCallback)
host.PatchbayPortAddedCallback.connect(self.slot_handlePatchbayPortAddedCallback)
host.PatchbayPortRemovedCallback.connect(self.slot_handlePatchbayPortRemovedCallback)
host.PatchbayPortRenamedCallback.connect(self.slot_handlePatchbayPortRenamedCallback)
host.PatchbayConnectionAddedCallback.connect(self.slot_handlePatchbayConnectionAddedCallback)
host.PatchbayConnectionRemovedCallback.connect(self.slot_handlePatchbayConnectionRemovedCallback)

if not doSetup: return

parent.ui.act_plugins_enable.triggered.connect(self.slot_pluginsEnable)
@@ -231,18 +243,6 @@ class CarlaPatchbayW(QFrame, PluginEditParentMeta):

parent.ui.act_settings_configure.triggered.connect(self.slot_configureCarla)

host.PluginAddedCallback.connect(self.slot_handlePluginAddedCallback)
host.PluginRemovedCallback.connect(self.slot_handlePluginRemovedCallback)
host.PatchbayClientAddedCallback.connect(self.slot_handlePatchbayClientAddedCallback)
host.PatchbayClientRemovedCallback.connect(self.slot_handlePatchbayClientRemovedCallback)
host.PatchbayClientRenamedCallback.connect(self.slot_handlePatchbayClientRenamedCallback)
host.PatchbayClientDataChangedCallback.connect(self.slot_handlePatchbayClientDataChangedCallback)
host.PatchbayPortAddedCallback.connect(self.slot_handlePatchbayPortAddedCallback)
host.PatchbayPortRemovedCallback.connect(self.slot_handlePatchbayPortRemovedCallback)
host.PatchbayPortRenamedCallback.connect(self.slot_handlePatchbayPortRenamedCallback)
host.PatchbayConnectionAddedCallback.connect(self.slot_handlePatchbayConnectionAddedCallback)
host.PatchbayConnectionRemovedCallback.connect(self.slot_handlePatchbayConnectionRemovedCallback)

# -----------------------------------------------------------------

def getPluginCount(self):


+ 4
- 4
source/carla_rack.py View File

@@ -315,6 +315,10 @@ class CarlaRackW(QFrame):
# -------------------------------------------------------------
# Connect actions to functions

host.PluginAddedCallback.connect(self.slot_handlePluginAddedCallback)
host.PluginRemovedCallback.connect(self.slot_handlePluginRemovedCallback)
host.ReloadAllCallback.connect(self.slot_handleReloadAllCallback)

if not doSetup: return

parent.ui.menu_Canvas.hide()
@@ -330,10 +334,6 @@ class CarlaRackW(QFrame):

parent.ui.act_settings_configure.triggered.connect(self.slot_configureCarla)

host.PluginAddedCallback.connect(self.slot_handlePluginAddedCallback)
host.PluginRemovedCallback.connect(self.slot_handlePluginRemovedCallback)
host.ReloadAllCallback.connect(self.slot_handleReloadAllCallback)

# -----------------------------------------------------------------

@pyqtSlot(int, str)


Loading…
Cancel
Save