@@ -3,7 +3,7 @@ | |||||
Cadence is a set of tools useful for audio production. <br/> | Cadence is a set of tools useful for audio production. <br/> | ||||
It's being developed by falkTX, using Python and Qt (and some C++ where needed). | It's being developed by falkTX, using Python and Qt (and some C++ where needed). | ||||
The tools share the same base source code, so most of them look quite similar (which is intentional). | |||||
The tools share the same base source code, so most of them look quite similar (which is intentional). <br/> | |||||
Also, lots of custom widgets were coded when needed (like pixmapdial, pixmapkeyboard, patchcanvas and systray). <br/> | Also, lots of custom widgets were coded when needed (like pixmapdial, pixmapkeyboard, patchcanvas and systray). <br/> | ||||
They can be re-used in other projects. Contact the author if you need help on that. | They can be re-used in other projects. Contact the author if you need help on that. | ||||
@@ -35,7 +35,7 @@ Tool to record (or 'render') a JACK project using jack-capture, controlled by JA | |||||
It supports a vast number of file types and can render in both realtime and freewheel modes. | It supports a vast number of file types and can render in both realtime and freewheel modes. | ||||
### [Cadence-XY Controller](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence-XYController) | ### [Cadence-XY Controller](http://kxstudio.sourceforge.net/KXStudio:Applications:Cadence-XYController) | ||||
simple XY widget that sends and receives data from Jack MIDI. <br/> | |||||
Simple XY widget that sends and receives data from Jack MIDI. <br/> | |||||
It can send data through specific channels and has a MIDI Keyboard too. | It can send data through specific channels and has a MIDI Keyboard too. | ||||
### [Catarina](http://kxstudio.sourceforge.net/KXStudio:Applications:Catarina) | ### [Catarina](http://kxstudio.sourceforge.net/KXStudio:Applications:Catarina) | ||||
@@ -140,7 +140,8 @@ class CatiaMainW(QMainWindow, ui_catia.Ui_CatiaMainW): | |||||
patchcanvas.init("Catia", self.scene, self.canvasCallback, DEBUG) | patchcanvas.init("Catia", self.scene, self.canvasCallback, DEBUG) | ||||
# Try to connect to jack | # Try to connect to jack | ||||
self.jackStarted() | |||||
if self.jackStarted(): | |||||
self.init_alsa_ports() | |||||
# DBus checks | # DBus checks | ||||
if haveDBus: | if haveDBus: | ||||
@@ -174,8 +175,6 @@ class CatiaMainW(QMainWindow, ui_catia.Ui_CatiaMainW): | |||||
self.act_tools_a2j_export_hw.setEnabled(False) | self.act_tools_a2j_export_hw.setEnabled(False) | ||||
self.menu_A2J_Bridge.setEnabled(False) | self.menu_A2J_Bridge.setEnabled(False) | ||||
self.init_alsa_ports() | |||||
self.m_timer120 = self.startTimer(self.m_savedSettings["Main/RefreshInterval"]) | self.m_timer120 = self.startTimer(self.m_savedSettings["Main/RefreshInterval"]) | ||||
self.m_timer600 = self.startTimer(self.m_savedSettings["Main/RefreshInterval"] * 5) | self.m_timer600 = self.startTimer(self.m_savedSettings["Main/RefreshInterval"] * 5) | ||||
@@ -846,7 +845,8 @@ class CatiaMainW(QMainWindow, ui_catia.Ui_CatiaMainW): | |||||
if not jack.client: | if not jack.client: | ||||
jack.client = jacklib.client_open("catia", jacklib.JackNoStartServer | jacklib.JackSessionID, None) | jack.client = jacklib.client_open("catia", jacklib.JackNoStartServer | jacklib.JackSessionID, None) | ||||
if not jack.client: | if not jack.client: | ||||
return self.jackStopped() | |||||
self.jackStopped() | |||||
return False | |||||
self.act_jack_render.setEnabled(canRender) | self.act_jack_render.setEnabled(canRender) | ||||
self.b_jack_render.setEnabled(canRender) | self.b_jack_render.setEnabled(canRender) | ||||
@@ -863,6 +863,8 @@ class CatiaMainW(QMainWindow, ui_catia.Ui_CatiaMainW): | |||||
self.init_jack() | self.init_jack() | ||||
return True | |||||
def jackStopped(self): | def jackStopped(self): | ||||
if haveDBus: | if haveDBus: | ||||
self.DBusReconnect() | self.DBusReconnect() | ||||