Skip to content

Commit

Permalink
Remove code regarding JACK Session
Browse files Browse the repository at this point in the history
Signed-off-by: falkTX <falktx@falktx.com>
  • Loading branch information
falkTX committed Aug 4, 2020
1 parent f840765 commit 84a1b7c
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions src/catia.py
Expand Up @@ -541,7 +541,6 @@ def initJackCallbacks(self):
jacklib.set_xrun_callback(gJack.client, self.JackXRunCallback, None)
jacklib.set_port_registration_callback(gJack.client, self.JackPortRegistrationCallback, None)
jacklib.set_port_connect_callback(gJack.client, self.JackPortConnectCallback, None)
jacklib.set_session_callback(gJack.client, self.JackSessionCallback, None)
jacklib.on_shutdown(gJack.client, self.JackShutdownCallback, None)

jacklib.set_client_rename_callback(gJack.client, self.JackClientRenameCallback, None)
Expand Down Expand Up @@ -951,7 +950,7 @@ def canvas_disconnectPortsByName(self, portOutName, portInName):

def jackStarted(self):
if not gJack.client:
gJack.client = jacklib.client_open("catia", jacklib.JackNoStartServer | jacklib.JackSessionID, None)
gJack.client = jacklib.client_open("catia", jacklib.JackNoStartServer, None)
if not gJack.client:
self.jackStopped()
return False
Expand Down Expand Up @@ -1087,23 +1086,6 @@ def JackPortRenameCallback(self, portId, oldName, newName, arg):
self.PortRenameCallback.emit(portId, str(oldName, encoding="utf-8"), str(newName, encoding="utf-8"))
return 0

def JackSessionCallback(self, event, arg):
if WINDOWS:
filepath = os.path.join(sys.argv[0])
else:
if sys.argv[0].startswith("/"):
filepath = "catia"
else:
filepath = os.path.join(sys.path[0], "catia.py")

event.command_line = str(filepath).encode("utf-8")
jacklib.session_reply(gJack.client, event)

if event.type == jacklib.JackSessionSaveAndQuit:
app.quit()

#jacklib.session_event_free(event)

def JackShutdownCallback(self, arg):
if DEBUG: print("JackShutdownCallback()")
self.ShutdownCallback.emit()
Expand Down

0 comments on commit 84a1b7c

Please sign in to comment.