Skip to content

Commit b69d157

Browse files
terencodefalkTX
authored andcommitted
DBus cast fixes
1 parent 12e3907 commit b69d157

File tree

2 files changed

+22
-16
lines changed

2 files changed

+22
-16
lines changed

src/cadence.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,7 +1310,7 @@ def DBusSignalReceiver(self, *args, **kwds):
13101310

13111311
def jackStarted(self):
13121312
self.m_last_dsp_load = gDBus.jack.GetLoad()
1313-
self.m_last_xruns = gDBus.jack.GetXruns()
1313+
self.m_last_xruns = int(gDBus.jack.GetXruns())
13141314
self.m_last_buffer_size = gDBus.jack.GetBufferSize()
13151315

13161316
self.b_jack_start.setEnabled(False)
@@ -2324,7 +2324,7 @@ def timerEvent(self, event):
23242324
if event.timerId() == self.m_timer500:
23252325
if gDBus.jack and self.m_last_dsp_load != None:
23262326
next_dsp_load = gDBus.jack.GetLoad()
2327-
next_xruns = gDBus.jack.GetXruns()
2327+
next_xruns = int(gDBus.jack.GetXruns())
23282328
needUpdateTip = False
23292329

23302330
if self.m_last_dsp_load != next_dsp_load:

src/jacksettings.py

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -404,28 +404,30 @@ def loadServerSettings(self, reset=False, forceReset=False):
404404
elif attribute == "alias":
405405
self.ui.obj_server_alias.setChecked(bool(value))
406406
elif attribute == "client-timeout":
407-
self.setComboBoxValue(self.ui.obj_server_client_timeout, str(value))
407+
self.setComboBoxValue(self.ui.obj_server_client_timeout, str(int(value)))
408408
elif attribute == "clock-source":
409-
value = str(value)
410-
if value == "c":
411-
self.ui.obj_server_clock_source_cycle.setChecked(True)
412-
elif value == "h":
413-
self.ui.obj_server_clock_source_hpet.setChecked(True)
414-
elif value == "s":
415-
self.ui.obj_server_clock_source_system.setChecked(True)
409+
if len(str(value)) == 1 :
410+
value = str(value)
411+
if value == "c":
412+
self.ui.obj_server_clock_source_cycle.setChecked(True)
413+
elif value == "h":
414+
self.ui.obj_server_clock_source_hpet.setChecked(True)
415+
elif value == "s":
416+
self.ui.obj_server_clock_source_system.setChecked(True)
416417
else:
418+
value = int(value)
417419
self.fBrokenServerClockSource = True
418-
if value == str(JACK_TIMER_SYSTEM_CLOCK):
420+
if value == JACK_TIMER_SYSTEM_CLOCK:
419421
self.ui.obj_server_clock_source_system.setChecked(True)
420-
elif value == str(JACK_TIMER_CYCLE_COUNTER):
422+
elif value == JACK_TIMER_CYCLE_COUNTER:
421423
self.ui.obj_server_clock_source_cycle.setChecked(True)
422-
elif value == str(JACK_TIMER_HPET):
424+
elif value == JACK_TIMER_HPET:
423425
self.ui.obj_server_clock_source_hpet.setChecked(True)
424426
else:
425427
self.ui.obj_server_clock_source.setEnabled(False)
426428
print("JackSettingsW::saveServerSettings() - Invalid clock-source value '%s'" % value)
427429
elif attribute == "port-max":
428-
self.setComboBoxValue(self.ui.obj_server_port_max, str(value))
430+
self.setComboBoxValue(self.ui.obj_server_port_max, str(int(value)))
429431
elif attribute == "replace-registry":
430432
self.ui.obj_server_replace_registry.setChecked(bool(value))
431433
elif attribute == "sync":
@@ -627,17 +629,21 @@ def loadDriverSettings(self, reset=False, forceReset=False):
627629
elif attribute == "capture":
628630
if self.fDriverName == "firewire":
629631
self.ui.obj_driver_capture.setCurrentIndex(1 if bool(value) else 0)
632+
elif self.fDriverName == "dummy":
633+
self.setComboBoxValue(self.ui.obj_driver_capture, str(int(value)), True)
630634
else:
631635
self.setComboBoxValue(self.ui.obj_driver_capture, str(value), True)
632636
elif attribute == "playback":
633637
if self.fDriverName == "firewire":
634638
self.ui.obj_driver_playback.setCurrentIndex(1 if bool(value) else 0)
639+
elif self.fDriverName == "dummy":
640+
self.setComboBoxValue(self.ui.obj_driver_playback, str(int(value)), True)
635641
else:
636642
self.setComboBoxValue(self.ui.obj_driver_playback, str(value), True)
637643
elif attribute == "rate":
638-
self.setComboBoxValue(self.ui.obj_driver_rate, str(value))
644+
self.setComboBoxValue(self.ui.obj_driver_rate, str(int(value)))
639645
elif attribute == "period":
640-
self.setComboBoxValue(self.ui.obj_driver_period, str(value))
646+
self.setComboBoxValue(self.ui.obj_driver_period, str(int(value)))
641647
elif attribute == "nperiods":
642648
self.ui.obj_driver_nperiods.setValue(int(value))
643649
elif attribute == "hwmon":

0 commit comments

Comments
 (0)