From 236dfd19394db7aa2d9f29fdfb44d668fd1a3d35 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 21 Sep 2013 22:58:49 +0200 Subject: [PATCH] Misc fixes --- source/backend/CarlaPlugin.hpp | 1 - source/carla_settings.py | 7 +++---- source/carla_widgets.py | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/source/backend/CarlaPlugin.hpp b/source/backend/CarlaPlugin.hpp index 54282553e..703e49cbd 100644 --- a/source/backend/CarlaPlugin.hpp +++ b/source/backend/CarlaPlugin.hpp @@ -689,7 +689,6 @@ public: /*! * Unlock the plugin's master mutex. - * \note The mutex wasTryLockCalled() flag will be unset */ void unlock(); diff --git a/source/carla_settings.py b/source/carla_settings.py index 461c8a2c9..a24797c90 100644 --- a/source/carla_settings.py +++ b/source/carla_settings.py @@ -177,8 +177,8 @@ class CarlaSettingsW(QDialog): # so add +2 pos padding if driverName != "JACK". PROCESS_MODE_NON_JACK_PADDING = 2 - def __init__(self, parent): - QDialog.__init__(self, parent, hasGL) + def __init__(self, parent, hasGL): + QDialog.__init__(self, parent) self.ui = ui_carla_settings.Ui_CarlaSettingsW() self.ui.setupUi(self) @@ -296,8 +296,7 @@ class CarlaSettingsW(QDialog): self.ui.ch_engine_uis_always_on_top.setChecked(settings.value("Engine/UIsAlwaysOnTop", CARLA_DEFAULT_UIS_ALWAYS_ON_TOP, type=bool)) self.ui.ch_engine_prefer_ui_bridges.setChecked(settings.value("Engine/PreferUiBridges", CARLA_DEFAULT_PREFER_UI_BRIDGES, type=bool)) #self.ui.sb_engine_oscgui_timeout.setValue(settings.value("Engine/OscUiTimeout", CARLA_DEFAULT_OSC_UI_TIMEOUT, type=int)) - self.ui.ch_engine_disable_checks.setChecked(settings.value("Engine/DisableChecks", CARLA_DEFAULT_DISABLE_CHECKS, type=bool)) - self.ui.ch_engine_dssi_chunks.setChecked(settings.value("Engine/UseDssiVstChunks", CARLA_DEFAULT_USE_DSSI_VST_CHUNKS, type=bool)) + #self.ui.ch_engine_disable_checks.setChecked(settings.value("Engine/DisableChecks", CARLA_DEFAULT_DISABLE_CHECKS, type=bool)) self.ui.ch_engine_prefer_plugin_bridges.setChecked(settings.value("Engine/PreferPluginBridges", CARLA_DEFAULT_PREFER_PLUGIN_BRIDGES, type=bool)) self.ui.ch_engine_force_stereo.setChecked(settings.value("Engine/ForceStereo", CARLA_DEFAULT_FORCE_STEREO, type=bool)) diff --git a/source/carla_widgets.py b/source/carla_widgets.py index d2cd32ab2..1ea80430e 100644 --- a/source/carla_widgets.py +++ b/source/carla_widgets.py @@ -565,8 +565,8 @@ class PluginEdit(QDialog): self.ui.dial_b_left.setEnabled(pluginHints & PLUGIN_CAN_BALANCE) self.ui.dial_b_right.setEnabled(pluginHints & PLUGIN_CAN_BALANCE) - self.ui.ch_fixed_buffer.setEnabled(self.fPluginInfo['optionsAvailable'] & PLUGIN_OPTION_FIXED_BUFFER) - self.ui.ch_fixed_buffer.setChecked(self.fPluginInfo['optionsEnabled'] & PLUGIN_OPTION_FIXED_BUFFER) + self.ui.ch_fixed_buffer.setEnabled(self.fPluginInfo['optionsAvailable'] & PLUGIN_OPTION_FIXED_BUFFERS) + self.ui.ch_fixed_buffer.setChecked(self.fPluginInfo['optionsEnabled'] & PLUGIN_OPTION_FIXED_BUFFERS) self.ui.ch_force_stereo.setEnabled(self.fPluginInfo['optionsAvailable'] & PLUGIN_OPTION_FORCE_STEREO) self.ui.ch_force_stereo.setChecked(self.fPluginInfo['optionsEnabled'] & PLUGIN_OPTION_FORCE_STEREO) self.ui.ch_map_program_changes.setEnabled(self.fPluginInfo['optionsAvailable'] & PLUGIN_OPTION_MAP_PROGRAM_CHANGES) @@ -588,7 +588,7 @@ class PluginEdit(QDialog): self.ui.tab_programs.setCurrentIndex(1) # Show/hide keyboard - showKeyboard = (pluginHints & PLUGIN_IS_SYNTH) != 0 or (midiCountInfo['ins'] > 0 < midiCountInfo['outs']) + showKeyboard = (self.fPluginInfo['category'] == PLUGIN_CATEGORY_SYNTH) != 0 or (midiCountInfo['ins'] > 0 < midiCountInfo['outs']) self.ui.scrollArea.setEnabled(showKeyboard) self.ui.scrollArea.setVisible(showKeyboard)