Browse Source

Misc

tags/1.9.5
falkTX 11 years ago
parent
commit
b1f2262a3e
2 changed files with 31 additions and 18 deletions
  1. +16
    -16
      source/carla_backend.py
  2. +15
    -2
      source/carla_widgets.py

+ 16
- 16
source/carla_backend.py View File

@@ -1187,12 +1187,12 @@ PyCarlaPluginInfo = {
'hints': 0x0, 'hints': 0x0,
'optionsAvailable': 0x0, 'optionsAvailable': 0x0,
'optionsEnabled': 0x0, 'optionsEnabled': 0x0,
'filename': None,
'name': None,
'label': None,
'maker': None,
'copyright': None,
'iconName': None,
'filename': "",
'name': "",
'label': "",
'maker': "",
'copyright': "",
'iconName': "",
'uniqueId': 0 'uniqueId': 0
} }


@@ -1206,10 +1206,10 @@ PyCarlaNativePluginInfo = {
'midiOuts': 0, 'midiOuts': 0,
'parameterIns': 0, 'parameterIns': 0,
'parameterOuts': 0, 'parameterOuts': 0,
'name': None,
'label': None,
'maker': None,
'copyright': None
'name': "",
'label': "",
'maker': "",
'copyright': ""
} }


# @see CarlaPortCountInfo # @see CarlaPortCountInfo
@@ -1220,16 +1220,16 @@ PyCarlaPortCountInfo = {


# @see CarlaParameterInfo # @see CarlaParameterInfo
PyCarlaParameterInfo = { PyCarlaParameterInfo = {
'name': None,
'symbol': None,
'unit': None,
'name': "",
'symbol': "",
'unit': "",
'scalePointCount': 0, 'scalePointCount': 0,
} }


# @see CarlaScalePointInfo # @see CarlaScalePointInfo
PyCarlaScalePointInfo = { PyCarlaScalePointInfo = {
'value': 0.0, 'value': 0.0,
'label': None
'label': ""
} }


# @see CarlaTransportInfo # @see CarlaTransportInfo
@@ -2022,10 +2022,10 @@ class CarlaHostNull(CarlaHostMeta):
return text return text


def get_juce_version(self): def get_juce_version(self):
return ""
return "3.0"


def get_supported_file_extensions(self): def get_supported_file_extensions(self):
return ""
return "*.carxp;*.carxs;*.mid;*.midi;*.sf2;*.gig;*.sfz;*.xmz;*.xiz"


def get_engine_driver_count(self): def get_engine_driver_count(self):
return 0 return 0


+ 15
- 2
source/carla_widgets.py View File

@@ -410,8 +410,13 @@ class PluginEditParentMeta():
# Plugin Editor (Built-in) # Plugin Editor (Built-in)


class PluginEdit(QDialog): class PluginEdit(QDialog):
# settings
kParamsPerPage = 8 kParamsPerPage = 8


# signals
SIGTERM = pyqtSignal()
SIGUSR1 = pyqtSignal()

def __init__(self, parent, host, pluginId): def __init__(self, parent, host, pluginId):
QDialog.__init__(self, parent.window() if parent is not None else None) QDialog.__init__(self, parent.window() if parent is not None else None)
self.host = host self.host = host
@@ -698,8 +703,8 @@ class PluginEdit(QDialog):
self.ui.le_unique_id.setText(str(self.fPluginInfo['uniqueId'])) self.ui.le_unique_id.setText(str(self.fPluginInfo['uniqueId']))
self.ui.le_unique_id.setToolTip(str(self.fPluginInfo['uniqueId'])) self.ui.le_unique_id.setToolTip(str(self.fPluginInfo['uniqueId']))


self.ui.label_plugin.setText("\n%s\n" % self.fPluginInfo['name'])
self.setWindowTitle(self.fPluginInfo['name'])
self.ui.label_plugin.setText("\n%s\n" % (self.fPluginInfo['name'] or "(none)"))
self.setWindowTitle(self.fPluginInfo['name'] or "(none)")


self.ui.dial_drywet.setEnabled(pluginHints & PLUGIN_CAN_DRYWET) self.ui.dial_drywet.setEnabled(pluginHints & PLUGIN_CAN_DRYWET)
self.ui.dial_vol.setEnabled(pluginHints & PLUGIN_CAN_VOLUME) self.ui.dial_vol.setEnabled(pluginHints & PLUGIN_CAN_VOLUME)
@@ -1520,6 +1525,14 @@ class PluginEdit(QDialog):
def testTimer(self): def testTimer(self):
self.fIdleTimerId = self.startTimer(50) self.fIdleTimerId = self.startTimer(50)


self.SIGTERM.connect(self.testTimerClose)
gCarla.gui = self
setUpSignals()

def testTimerClose(self):
self.close()
app.quit()

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


def closeEvent(self, event): def closeEvent(self, event):


Loading…
Cancel
Save