diff --git a/source/carla b/source/carla index c7dadedbc..4d17787fa 100755 --- a/source/carla +++ b/source/carla @@ -38,8 +38,8 @@ class CarlaMultiW(QTabWidget): def __init__(self, parent): QTabWidget.__init__(self, parent) - self.fRack = CarlaRackW(parent) - self.fPatchbay = CarlaPatchbayW(parent) + self.fRack = CarlaRackW(parent, False) + self.fPatchbay = CarlaPatchbayW(parent, False) self.fParent = parent self.addTab(self.fRack, "Plugins") @@ -47,6 +47,51 @@ class CarlaMultiW(QTabWidget): self.scene = self.fPatchbay.scene + parent.ui.act_plugins_enable.triggered.connect(self.fRack.slot_pluginsEnable) + parent.ui.act_plugins_disable.triggered.connect(self.fRack.slot_pluginsDisable) + parent.ui.act_plugins_volume100.triggered.connect(self.fRack.slot_pluginsVolume100) + parent.ui.act_plugins_mute.triggered.connect(self.fRack.slot_pluginsMute) + parent.ui.act_plugins_wet100.triggered.connect(self.fRack.slot_pluginsWet100) + parent.ui.act_plugins_bypass.triggered.connect(self.fRack.slot_pluginsBypass) + parent.ui.act_plugins_center.triggered.connect(self.fRack.slot_pluginsCenter) + parent.ui.act_plugins_panic.triggered.connect(self.fRack.slot_pluginsDisable) + + parent.ui.act_canvas_arrange.setEnabled(False) # TODO, later + parent.ui.act_canvas_arrange.triggered.connect(self.fPatchbay.slot_canvasArrange) + parent.ui.act_canvas_refresh.triggered.connect(self.fPatchbay.slot_canvasRefresh) + parent.ui.act_canvas_zoom_fit.triggered.connect(self.fPatchbay.slot_canvasZoomFit) + parent.ui.act_canvas_zoom_in.triggered.connect(self.fPatchbay.slot_canvasZoomIn) + parent.ui.act_canvas_zoom_out.triggered.connect(self.fPatchbay.slot_canvasZoomOut) + parent.ui.act_canvas_zoom_100.triggered.connect(self.fPatchbay.slot_canvasZoomReset) + parent.ui.act_canvas_print.triggered.connect(self.fPatchbay.slot_canvasPrint) + parent.ui.act_canvas_save_image.triggered.connect(self.fPatchbay.slot_canvasSaveImage) + + parent.ui.act_settings_configure.triggered.connect(self.fPatchbay.slot_configureCarla) + + parent.ParameterValueChangedCallback.connect(self.fRack.slot_handleParameterValueChangedCallback) + parent.ParameterDefaultChangedCallback.connect(self.fRack.slot_handleParameterDefaultChangedCallback) + parent.ParameterMidiChannelChangedCallback.connect(self.fRack.slot_handleParameterMidiChannelChangedCallback) + parent.ParameterMidiCcChangedCallback.connect(self.fRack.slot_handleParameterMidiCcChangedCallback) + parent.ProgramChangedCallback.connect(self.fRack.slot_handleProgramChangedCallback) + parent.MidiProgramChangedCallback.connect(self.fRack.slot_handleMidiProgramChangedCallback) + parent.NoteOnCallback.connect(self.fRack.slot_handleNoteOnCallback) + parent.NoteOffCallback.connect(self.fRack.slot_handleNoteOffCallback) + parent.ShowGuiCallback.connect(self.fRack.slot_handleShowGuiCallback) + parent.UpdateCallback.connect(self.fRack.slot_handleUpdateCallback) + parent.ReloadInfoCallback.connect(self.fRack.slot_handleReloadInfoCallback) + parent.ReloadParametersCallback.connect(self.fRack.slot_handleReloadParametersCallback) + parent.ReloadProgramsCallback.connect(self.fRack.slot_handleReloadProgramsCallback) + parent.ReloadAllCallback.connect(self.fRack.slot_handleReloadAllCallback) + parent.PatchbayClientAddedCallback.connect(self.fPatchbay.slot_handlePatchbayClientAddedCallback) + parent.PatchbayClientRemovedCallback.connect(self.fPatchbay.slot_handlePatchbayClientRemovedCallback) + parent.PatchbayClientRenamedCallback.connect(self.fPatchbay.slot_handlePatchbayClientRenamedCallback) + parent.PatchbayPortAddedCallback.connect(self.fPatchbay.slot_handlePatchbayPortAddedCallback) + parent.PatchbayPortRemovedCallback.connect(self.fPatchbay.slot_handlePatchbayPortRemovedCallback) + parent.PatchbayPortRenamedCallback.connect(self.fPatchbay.slot_handlePatchbayPortRenamedCallback) + parent.PatchbayConnectionAddedCallback.connect(self.fPatchbay.slot_handlePatchbayConnectionAddedCallback) + parent.PatchbayConnectionRemovedCallback.connect(self.fPatchbay.slot_handlePatchbayConnectionRemovedCallback) + parent.PatchbayIconChangedCallback.connect(self.fPatchbay.slot_handlePatchbayIconChangedCallback) + # ----------------------------------------------------------------- def getPluginCount(self): @@ -56,11 +101,9 @@ class CarlaMultiW(QTabWidget): def addPlugin(self, pluginId, isProjectLoading): self.fRack.addPlugin(pluginId, isProjectLoading) - self.fPatchbay.addPlugin(pluginId, isProjectLoading) def removePlugin(self, pluginId): self.fRack.removePlugin(pluginId) - self.fPatchbay.removePlugin(pluginId) def renamePlugin(self, pluginId, newName): self.fRack.renamePlugin(pluginId, newName) @@ -68,17 +111,16 @@ class CarlaMultiW(QTabWidget): def removeAllPlugins(self): self.fRack.removeAllPlugins() - self.fPatchbay.removeAllPlugins() # ----------------------------------------------------------------- def engineStarted(self): - self.fRack.engineStarted() - self.fPatchbay.engineStarted() + #self.fRack.engineStarted() + #self.fPatchbay.engineStarted() self.fParent.engineChanged() def engineStopped(self): - self.fRack.engineStopped() + #self.fRack.engineStopped() self.fPatchbay.engineStopped() self.fParent.engineStopped() @@ -89,17 +131,16 @@ class CarlaMultiW(QTabWidget): def idleFast(self): self.fRack.idleFast() - self.fPatchbay.idleFast() def idleSlow(self): self.fRack.idleSlow() - self.fPatchbay.idleSlow() # ----------------------------------------------------------------- def saveSettings(self, settings): - self.fRack.saveSettings(settings) - self.fPatchbay.saveSettings(settings) + pass + #self.fRack.saveSettings(settings) + #self.fPatchbay.saveSettings(settings) # ------------------------------------------------------------------------------------------------------------ # Main Window @@ -226,7 +267,6 @@ if __name__ == '__main__': Carla.isControl = False Carla.isLocal = True Carla.isPlugin = False - Carla.processMode = PROCESS_MODE_CONTINUOUS_RACK initHost(appName, libPrefix) diff --git a/source/carla_patchbay.py b/source/carla_patchbay.py index 4e7193202..6ce7028ee 100644 --- a/source/carla_patchbay.py +++ b/source/carla_patchbay.py @@ -50,7 +50,7 @@ except: # Patchbay widget class CarlaPatchbayW(QGraphicsView): - def __init__(self, parent): + def __init__(self, parent, doSetup = True): QGraphicsView.__init__(self, parent) # ------------------------------------------------------------- @@ -86,7 +86,7 @@ class CarlaPatchbayW(QGraphicsView): patchcanvas.setOptions(pOptions) patchcanvas.setFeatures(pFeatures) - patchcanvas.init("Carla", self.scene, CanvasCallback, True) + patchcanvas.init("Carla", self.scene, CanvasCallback, False) tryCanvasSize = parent.fSavedSettings[CARLA_KEY_CANVAS_SIZE].split("x") @@ -104,6 +104,8 @@ class CarlaPatchbayW(QGraphicsView): # ------------------------------------------------------------- # Connect actions to functions + if not doSetup: return + parent.ui.act_plugins_enable.triggered.connect(self.slot_pluginsEnable) parent.ui.act_plugins_disable.triggered.connect(self.slot_pluginsDisable) parent.ui.act_plugins_volume100.triggered.connect(self.slot_pluginsVolume100) @@ -125,6 +127,14 @@ class CarlaPatchbayW(QGraphicsView): parent.ui.act_settings_configure.triggered.connect(self.slot_configureCarla) + #self.ui.miniCanvasPreview-miniCanvasMoved(double, double)"), SLOT("slot_miniCanvasMoved(double, double)")) + + #self.ui.graphicsView.horizontalScrollBar()-valueChanged.connect(self.slot_horizontalScrollBarChanged) + #self.ui.graphicsView.verticalScrollBar()-valueChanged.connect(self.slot_verticalScrollBarChanged) + + #self.scene-sceneGroupMoved(int, int, QPointF)"), SLOT("slot_canvasItemMoved(int, int, QPointF)")) + #self.scene-scaleChanged(double)"), SLOT("slot_canvasScaleChanged(double)")) + parent.ParameterValueChangedCallback.connect(self.slot_handleParameterValueChangedCallback) parent.ParameterDefaultChangedCallback.connect(self.slot_handleParameterDefaultChangedCallback) parent.ParameterMidiChannelChangedCallback.connect(self.slot_handleParameterMidiChannelChangedCallback) @@ -148,13 +158,6 @@ class CarlaPatchbayW(QGraphicsView): parent.PatchbayConnectionAddedCallback.connect(self.slot_handlePatchbayConnectionAddedCallback) parent.PatchbayConnectionRemovedCallback.connect(self.slot_handlePatchbayConnectionRemovedCallback) parent.PatchbayIconChangedCallback.connect(self.slot_handlePatchbayIconChangedCallback) - #self.ui.miniCanvasPreview-miniCanvasMoved(double, double)"), SLOT("slot_miniCanvasMoved(double, double)")) - - #self.ui.graphicsView.horizontalScrollBar()-valueChanged.connect(self.slot_horizontalScrollBarChanged) - #self.ui.graphicsView.verticalScrollBar()-valueChanged.connect(self.slot_verticalScrollBarChanged) - - #self.scene-sceneGroupMoved(int, int, QPointF)"), SLOT("slot_canvasItemMoved(int, int, QPointF)")) - #self.scene-scaleChanged(double)"), SLOT("slot_canvasScaleChanged(double)")) # ----------------------------------------------------------------- diff --git a/source/carla_rack.py b/source/carla_rack.py index 4e03ce6e4..138fac49c 100644 --- a/source/carla_rack.py +++ b/source/carla_rack.py @@ -60,7 +60,7 @@ class CarlaRackItem(QListWidgetItem): # Rack widget class CarlaRackW(QListWidget): - def __init__(self, parent): + def __init__(self, parent, doSetup = True): QListWidget.__init__(self, parent) # ------------------------------------------------------------- @@ -96,8 +96,7 @@ class CarlaRackW(QListWidget): # ------------------------------------------------------------- # Connect actions to functions - if parent is None: - return + if not doSetup: return parent.ui.menu_Canvas.hide()