Misc

source/carla

@@ -74,9 +74,9 @@ class CarlaMultiW(QTabWidget):
         parent.ParameterMidiCcChangedCallback.connect(self.fRack.slot_handleParameterMidiCcChangedCallback)
         parent.ProgramChangedCallback.connect(self.fRack.slot_handleProgramChangedCallback)
         parent.MidiProgramChangedCallback.connect(self.fRack.slot_handleMidiProgramChangedCallback)
+        parent.UiStateChangedCallback.connect(self.fRack.slot_handleUiStateChangedCallback)
         parent.NoteOnCallback.connect(self.fRack.slot_handleNoteOnCallback)
         parent.NoteOffCallback.connect(self.fRack.slot_handleNoteOffCallback)
-        parent.UiStateChangedCallback.connect(self.fRack.slot_handleUiStateChangedCallback)
         parent.UpdateCallback.connect(self.fRack.slot_handleUpdateCallback)
         parent.ReloadInfoCallback.connect(self.fRack.slot_handleReloadInfoCallback)
         parent.ReloadParametersCallback.connect(self.fRack.slot_handleReloadParametersCallback)
@@ -85,12 +85,12 @@ class CarlaMultiW(QTabWidget):
         parent.PatchbayClientAddedCallback.connect(self.fPatchbay.slot_handlePatchbayClientAddedCallback)
         parent.PatchbayClientRemovedCallback.connect(self.fPatchbay.slot_handlePatchbayClientRemovedCallback)
         parent.PatchbayClientRenamedCallback.connect(self.fPatchbay.slot_handlePatchbayClientRenamedCallback)
+        #parent.PatchbayIconChangedCallback.connect(self.fPatchbay.slot_handlePatchbayIconChangedCallback)
         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)
 
     # -----------------------------------------------------------------
 
@@ -109,6 +109,9 @@ class CarlaMultiW(QTabWidget):
         self.fRack.renamePlugin(pluginId, newName)
         self.fPatchbay.renamePlugin(pluginId, newName)
 
+    def disablePlugin(self, pluginId, errorMsg):
+        pass
+
     def removeAllPlugins(self):
         self.fRack.removeAllPlugins()
 
@@ -176,7 +179,7 @@ class CarlaHostW(HostWindow):
         self.fInfoLabel.setText("Engine stopped")
 
     def engineChanged(self):
-        self.fInfoText = "Engine running | SampleRate: %g | BufferSize: %i" % (self.fSampleRate, self.fBufferSize)
+        self.fInfoText = "Engine running | SampleRate: %g | BufferSize: %i" % (Carla.sampleRate, Carla.bufferSize)
         self.fInfoLabel.setText("%s | %s" % (self.fInfoText, self.fTextTransport))
 
     # -----------------------------------------------------------------

source/carla_host.py

@@ -883,7 +883,7 @@ class HostWindow(QMainWindow):
     def slot_fileTreeDoubleClicked(self, modelIndex):
         filename = self.fDirModel.filePath(modelIndex)
 
-        if not Carla.host.load_filename(filename):
+        if not Carla.host.load_file(filename):
             CustomMessageBox(self, QMessageBox.Critical, self.tr("Error"),
                              self.tr("Failed to load file"),
                              Carla.host.get_last_error(), QMessageBox.Ok, QMessageBox.Ok)

source/carla_patchbay.py

@@ -19,9 +19,6 @@
 # ------------------------------------------------------------------------------------------------------------
 # Imports (Global)
 
-#try:
-    #from PyQt5.QtWidgets import QGraphicsView
-#except:
 from PyQt4.QtGui import QGraphicsView
 
 #QPrinter, QPrintDialog
@@ -38,9 +35,6 @@ from carla_widgets import *
 # Try Import OpenGL
 
 try:
-    #try:
-        #from PyQt5.QtOpenGL import QGLWidget
-    #except:
     from PyQt4.QtOpenGL import QGLWidget
     hasGL = True
 except:
@@ -353,6 +347,7 @@ class CarlaPatchbayW(QGraphicsView):
             return
 
         self.fParent.loadSettings(False)
+
         patchcanvas.clear()
 
         pOptions = patchcanvas.options_t()
@@ -371,7 +366,7 @@ class CarlaPatchbayW(QGraphicsView):
 
         patchcanvas.setOptions(pOptions)
         patchcanvas.setFeatures(pFeatures)
-        patchcanvas.init("Carla2", self.scene, CanvasCallback, False)
+        patchcanvas.init("Carla2", self.scene, canvasCallback, False)
 
         if Carla.host.is_engine_running():
             Carla.host.patchbay_refresh()
@@ -668,7 +663,7 @@ class CarlaPatchbayW(QGraphicsView):
 # ------------------------------------------------------------------------------------------------
 # Canvas callback
 
-def CanvasCallback(action, value1, value2, valueStr):
+def canvasCallback(action, value1, value2, valueStr):
     if action == patchcanvas.ACTION_GROUP_INFO:
         pass
 
@@ -696,10 +691,10 @@ def CanvasCallback(action, value1, value2, valueStr):
         portIdB = value2
 
         if not Carla.host.patchbay_connect(portIdA, portIdB):
-            print("Connection failed:", cString(Carla.host.get_last_error()))
+            print("Connection failed:", Carla.host.get_last_error())
 
     elif action == patchcanvas.ACTION_PORTS_DISCONNECT:
         connectionId = value1
 
         if not Carla.host.patchbay_disconnect(connectionId):
-            print("Disconnect failed:", cString(Carla.host.get_last_error()))
+            print("Disconnect failed:", Carla.host.get_last_error())