Skip to content

put _wrap_port_ptr calls in try statment, to avoid errors when port is nor audio nor midi #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

put _wrap_port_ptr calls in try statment, to avoid errors when port is nor audio nor midi #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 26 additions & 5 deletions src/jack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,10 @@ def set_port_registration_callback(self, callback=None,
def callback_wrapper(port_id, register, _):
port_ptr = _lib.jack_port_by_id(self._ptr, port_id)
if port_ptr:
port = self._wrap_port_ptr(port_ptr)
try:
port = self._wrap_port_ptr(port_ptr)
except AssertionError:
return
elif only_available:
return
else:
Expand Down Expand Up @@ -1121,7 +1124,10 @@ def callback_wrapper(a, b, connect, _):
for idx in 0, 1:
ptr = _lib.jack_port_by_id(self._ptr, port_ids[idx])
if ptr:
ports[idx] = self._wrap_port_ptr(ptr)
try:
ports[idx] = self._wrap_port_ptr(ptr)
except AssertionError:
return
elif only_available:
return
else:
Expand Down Expand Up @@ -1184,7 +1190,10 @@ def set_port_rename_callback(self, callback=None, only_available=True):
def callback_wrapper(port_id, old_name, new_name, _):
port_ptr = _lib.jack_port_by_id(self._ptr, port_id)
if port_ptr:
port = self._wrap_port_ptr(port_ptr)
try:
port = self._wrap_port_ptr(port_ptr)
except AssertionError:
return
elif only_available:
return
else:
Expand Down Expand Up @@ -1534,7 +1543,13 @@ def get_port_by_name(self, name):
port_ptr = _lib.jack_port_by_name(self._ptr, name.encode())
if not port_ptr:
raise JackError(f'Port {name!r} not available')
return self._wrap_port_ptr(port_ptr)

try:
port = self._wrap_port_ptr(port_ptr)
except AssertionError:
raise JackError(f'Port {name!r} not audio or midi')

return port

def get_all_connections(self, port):
"""Return a list of ports which the given port is connected to.
Expand Down Expand Up @@ -1762,7 +1777,13 @@ def _register_port(self, name, porttype, is_terminal, is_physical, flags):
if not port_ptr:
raise JackError(
f'{name!r}: port registration failed')
return self._wrap_port_ptr(port_ptr)

try:
port = self._wrap_port_ptr(port_ptr)
except AssertionError:
raise JackError(
f'{name!r}: port registration failed, not audio or midi')
return port

def _port_list_from_pointers(self, names):
"""Get list of Port objects from char**."""
Expand Down