Browse Source

Misc fixing

tags/1.9.7
falkTX 11 years ago
parent
commit
d2303175a5
3 changed files with 24 additions and 7 deletions
  1. +0
    -4
      source/backend/engine/CarlaEngineNative.cpp
  2. +8
    -0
      source/backend/engine/CarlaEngineThread.cpp
  3. +16
    -3
      source/carla_settings.py

+ 0
- 4
source/backend/engine/CarlaEngineNative.cpp View File

@@ -1558,10 +1558,6 @@ protected:
}
}

#ifdef HAVE_LIBLO
pData->osc.idle();
#endif

if (fUiServer.isPipeRunning())
{
fUiServer.idlePipe();


+ 8
- 0
source/backend/engine/CarlaEngineThread.cpp View File

@@ -47,6 +47,9 @@ void CarlaEngineThread::run() noexcept
#endif
carla_debug("CarlaEngineThread::run()");

#ifdef HAVE_LIBLO
const bool isPlugin(kEngine->getType() == kEngineTypePlugin);
#endif
float value;

#ifdef BUILD_BRIDGE
@@ -61,6 +64,11 @@ void CarlaEngineThread::run() noexcept
const bool oscRegisted = false;
#endif

#ifdef HAVE_LIBLO
if (isPlugin)
kEngine->idleOsc();
#endif

for (uint i=0, count = kEngine->getCurrentPluginCount(); i < count; ++i)
{
CarlaPlugin* const plugin(kEngine->getPluginUnchecked(i));


+ 16
- 3
source/carla_settings.py View File

@@ -237,7 +237,12 @@ class CarlaSettingsW(QDialog):
if WINDOWS and not config_UseQt5:
self.ui.group_main_theme.setEnabled(False)

if not hasCanvas:
if host.isControl:
self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS)
self.ui.lw_page.hideRow(self.TAB_INDEX_ENGINE)
self.ui.lw_page.hideRow(self.TAB_INDEX_PATHS)

elif not hasCanvas:
self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS)

elif not hasCanvasGL:
@@ -309,7 +314,7 @@ class CarlaSettingsW(QDialog):
# --------------------------------------------------------------------------------------------------------

def loadSettings(self):
settings = QSettings("falkTX", "Carla2")
settings = QSettings()

# ----------------------------------------------------------------------------------------------------
# Main
@@ -333,6 +338,10 @@ class CarlaSettingsW(QDialog):
self.ui.cb_canvas_render_aa.setCheckState(settings.value(CARLA_KEY_CANVAS_ANTIALIASING, CARLA_DEFAULT_CANVAS_ANTIALIASING, type=int))
self.ui.cb_canvas_render_hq_aa.setChecked(settings.value(CARLA_KEY_CANVAS_HQ_ANTIALIASING, CARLA_DEFAULT_CANVAS_HQ_ANTIALIASING, type=bool) and self.ui.cb_canvas_render_hq_aa.isEnabled())

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

settings = QSettings("falkTX", "Carla2")

# ----------------------------------------------------------------------------------------------------
# Engine

@@ -427,7 +436,7 @@ class CarlaSettingsW(QDialog):

@pyqtSlot()
def slot_saveSettings(self):
settings = QSettings("falkTX", "Carla2")
settings = QSettings()

# ----------------------------------------------------------------------------------------------------
# Main
@@ -451,6 +460,10 @@ class CarlaSettingsW(QDialog):
settings.setValue(CARLA_KEY_CANVAS_HQ_ANTIALIASING, self.ui.cb_canvas_render_hq_aa.isChecked())
settings.setValue(CARLA_KEY_CANVAS_ANTIALIASING, self.ui.cb_canvas_render_aa.checkState()) # 0, 1, 2 match their enum variants

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

settings = QSettings("falkTX", "Carla2")

# ----------------------------------------------------------------------------------------------------
# Engine



Loading…
Cancel
Save