Skip to content
This repository was archived by the owner on Aug 21, 2023. It is now read-only.

client-name for Net driver #223

Open
riccardocagnasso wants to merge 8 commits into
base: master
Choose a base branch
from
Open

client-name for Net driver #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
18f9b10
client-name in Net misc parameters
Aug 7, 2018
21b56bf
client-name for Net driver (UI)
Aug 7, 2018
ccfb666
fixed unwanted modifications
Aug 7, 2018
e4e6399
net gui initial
Aug 8, 2018
21a636c
channels number for jack net
Aug 8, 2018
21ffee6
netmanager support
Aug 11, 2018
ee159a8
removed annoying message boxes
Aug 13, 2018
771125c
channels fix
Aug 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 170 additions & 16 deletions resources/ui/settings_jack.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>680</width>
<height>449</height>
<width>749</width>
<height>569</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="engine">
<attribute name="title">
Expand Down Expand Up @@ -1335,6 +1335,43 @@ Also known as buffer size</string>
</item>
</layout>
</widget>
<widget class="QWidget" name="toolbox_driver_miscPageNet">
<layout class="QGridLayout" name="gridLayout_15">
<item row="2" column="0">
<widget class="QLabel" name="obj_driver_hostname_label">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Client name</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>200</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="obj_driver_client_name">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
Expand All @@ -1348,19 +1385,136 @@ Also known as buffer size</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label">
<property name="font">
<font>
<pointsize>16</pointsize>
</font>
</property>
<property name="text">
<string>Not Implemented Yet</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QGroupBox" name="">
<property name="title">
<string>Settings</string>
</property>
<layout class="QGridLayout" name="gridLayout_16">
<item row="1" column="1">
<widget class="QSpinBox" name="obj_net_multicast_port">
<property name="maximum">
<number>65536</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Auto Connect Ports</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Multicast Ip</string>
</property>
</widget>
</item>
<item row="4" column="1">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="obj_net_multicast_ip"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Udp Net Port</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Auto Save</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="obj_net_auto_connect">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="obj_net_auto_save">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="">
<property name="title">
<string>Controls</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QCheckBox" name="obj_net_manager_at_boot">
<property name="text">
<string>Start at Boot</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="obj_net_reset">
<property name="text">
<string>Reset Network Settings</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QPushButton" name="obj_net_manager_start">
<property name="text">
<string>Start</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="obj_net_manager_stop">
<property name="text">
<string>Stop</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
Expand Down
9 changes: 7 additions & 2 deletions src/cadence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1373,6 +1373,10 @@ def jackStarted(self):
self.checkAlsaAudio()
self.checkPulseAudio()

if GlobalSettings.value("JACKNETMANAGER/AutoStart"):
print("loadinternal")
gDBus.jack.LoadInternal("netmanager")

def jackStopped(self):
if self.m_timer500:
self.killTimer(self.m_timer500)
Expand Down Expand Up @@ -1674,7 +1678,8 @@ def slot_JackServerStart(self):
try:
gDBus.jack.StartServer()
except:
QMessageBox.warning(self, self.tr("Warning"), self.tr("Failed to start JACK, please check the logs for more information."))
pass
#QMessageBox.warning(self, self.tr("Warning"), self.tr("Failed to start JACK, please check the logs for more information."))

@pyqtSlot()
def slot_JackServerStop(self):
Expand Down Expand Up @@ -2386,7 +2391,7 @@ def taskInMainThread():

if haveDBus:
gDBus.loop = DBusQtMainLoop(set_as_default=True)
gDBus.bus = dbus.SessionBus(mainloop=gDBus.loop)
gDBus.bus = dbus.SessionBus(mainloop=gDBus.loop)

initSystemChecks()

Expand Down
3 changes: 2 additions & 1 deletion src/catia.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,8 @@ def slot_JackServerStart(self):
try:
ret = bool(gDBus.jack.StartServer())
except:
QMessageBox.warning(self, self.tr("Warning"), self.tr("Failed to start JACK, please check the logs for more information."))
pass
#QMessageBox.warning(self, self.tr("Warning"), self.tr("Failed to start JACK, please check the logs for more information."))
#self.jackStopped()
return ret

Expand Down
Loading