From b69d157501bdf004dbd4c121eec12afd189057cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=A9rence=20Clastres?= Date: Sun, 17 Nov 2019 18:26:46 +0100 Subject: [PATCH] DBus cast fixes --- src/cadence.py | 4 ++-- src/jacksettings.py | 40 +++++++++++++++++++++++----------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/cadence.py b/src/cadence.py index 708dd4b..d99ab33 100755 --- a/src/cadence.py +++ b/src/cadence.py @@ -1310,7 +1310,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW): def jackStarted(self): self.m_last_dsp_load = gDBus.jack.GetLoad() - self.m_last_xruns = gDBus.jack.GetXruns() + self.m_last_xruns = int(gDBus.jack.GetXruns()) self.m_last_buffer_size = gDBus.jack.GetBufferSize() self.b_jack_start.setEnabled(False) @@ -2324,7 +2324,7 @@ class CadenceMainW(QMainWindow, ui_cadence.Ui_CadenceMainW): if event.timerId() == self.m_timer500: if gDBus.jack and self.m_last_dsp_load != None: next_dsp_load = gDBus.jack.GetLoad() - next_xruns = gDBus.jack.GetXruns() + next_xruns = int(gDBus.jack.GetXruns()) needUpdateTip = False if self.m_last_dsp_load != next_dsp_load: diff --git a/src/jacksettings.py b/src/jacksettings.py index 69e9f75..d90a838 100755 --- a/src/jacksettings.py +++ b/src/jacksettings.py @@ -404,28 +404,30 @@ class JackSettingsW(QDialog): elif attribute == "alias": self.ui.obj_server_alias.setChecked(bool(value)) elif attribute == "client-timeout": - self.setComboBoxValue(self.ui.obj_server_client_timeout, str(value)) + self.setComboBoxValue(self.ui.obj_server_client_timeout, str(int(value))) elif attribute == "clock-source": - value = str(value) - if value == "c": - self.ui.obj_server_clock_source_cycle.setChecked(True) - elif value == "h": - self.ui.obj_server_clock_source_hpet.setChecked(True) - elif value == "s": - self.ui.obj_server_clock_source_system.setChecked(True) - else: - self.fBrokenServerClockSource = True - if value == str(JACK_TIMER_SYSTEM_CLOCK): - self.ui.obj_server_clock_source_system.setChecked(True) - elif value == str(JACK_TIMER_CYCLE_COUNTER): + if len(str(value)) == 1 : + value = str(value) + if value == "c": self.ui.obj_server_clock_source_cycle.setChecked(True) - elif value == str(JACK_TIMER_HPET): + elif value == "h": + self.ui.obj_server_clock_source_hpet.setChecked(True) + elif value == "s": + self.ui.obj_server_clock_source_system.setChecked(True) + else: + value = int(value) + self.fBrokenServerClockSource = True + if value == JACK_TIMER_SYSTEM_CLOCK: + self.ui.obj_server_clock_source_system.setChecked(True) + elif value == JACK_TIMER_CYCLE_COUNTER: + self.ui.obj_server_clock_source_cycle.setChecked(True) + elif value == JACK_TIMER_HPET: self.ui.obj_server_clock_source_hpet.setChecked(True) else: self.ui.obj_server_clock_source.setEnabled(False) print("JackSettingsW::saveServerSettings() - Invalid clock-source value '%s'" % value) elif attribute == "port-max": - self.setComboBoxValue(self.ui.obj_server_port_max, str(value)) + self.setComboBoxValue(self.ui.obj_server_port_max, str(int(value))) elif attribute == "replace-registry": self.ui.obj_server_replace_registry.setChecked(bool(value)) elif attribute == "sync": @@ -627,17 +629,21 @@ class JackSettingsW(QDialog): elif attribute == "capture": if self.fDriverName == "firewire": self.ui.obj_driver_capture.setCurrentIndex(1 if bool(value) else 0) + elif self.fDriverName == "dummy": + self.setComboBoxValue(self.ui.obj_driver_capture, str(int(value)), True) else: self.setComboBoxValue(self.ui.obj_driver_capture, str(value), True) elif attribute == "playback": if self.fDriverName == "firewire": self.ui.obj_driver_playback.setCurrentIndex(1 if bool(value) else 0) + elif self.fDriverName == "dummy": + self.setComboBoxValue(self.ui.obj_driver_playback, str(int(value)), True) else: self.setComboBoxValue(self.ui.obj_driver_playback, str(value), True) elif attribute == "rate": - self.setComboBoxValue(self.ui.obj_driver_rate, str(value)) + self.setComboBoxValue(self.ui.obj_driver_rate, str(int(value))) elif attribute == "period": - self.setComboBoxValue(self.ui.obj_driver_period, str(value)) + self.setComboBoxValue(self.ui.obj_driver_period, str(int(value))) elif attribute == "nperiods": self.ui.obj_driver_nperiods.setValue(int(value)) elif attribute == "hwmon":