Commit de826408 authored by Geoffrey McRae's avatar Geoffrey McRae Committed by Gerd Hoffmann
Browse files

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: default avatarGeoffrey McRae <geoff@hostfission.com>
Message-id: 20200613040518.38172-5-geoff@hostfission.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent f8f0f218

audio/jackaudio.c

+0 −3
Original line number Diff line number Diff line
@@ -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 */