aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorGeoffrey McRae <geoff@hostfission.com>2020-06-13 14:05:16 +1000
committerGerd Hoffmann <kraxel@redhat.com>2020-06-17 14:44:51 +0200
commitde82640843769e84139b5b5a8ed60b076f0bcabe (patch)
treef9be77bf9dc8c16e86f695495c9335ce1c8e37ec /audio
parentf8f0f218d4212598eab6c824754cfc40d4961ab7 (diff)
audio/jack: do not remove ports when finishing
This fixes a hang when there is a communications issue with the JACK server. Simply closing the connection is enough to completely clean up and as such we do not need to remove the ports first. As JACK uses a socket based protocol that relies on the `select` call, if there is a communication breakdown with the server the client library waits forever for a response to the unregister request. Signed-off-by: Geoffrey McRae <geoff@hostfission.com> Message-id: 20200613040518.38172-5-geoff@hostfission.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'audio')
-rw-r--r--audio/jackaudio.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/audio/jackaudio.c b/audio/jackaudio.c
index 58c7344497..249cbd3265 100644
--- a/audio/jackaudio.c
+++ b/audio/jackaudio.c
@@ -548,9 +548,6 @@ static void qjack_client_fini(QJackClient *c)
{
switch (c->state) {
case QJACK_STATE_RUNNING:
- for (int i = 0; i < c->nchannels; ++i) {
- jack_port_unregister(c->client, c->port[i]);
- }
jack_deactivate(c->client);
/* fallthrough */