[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/7] audio/jack: do not remove ports when finishing
From: |
Gerd Hoffmann |
Subject: |
[PULL 4/7] audio/jack: do not remove ports when finishing |
Date: |
Fri, 19 Jun 2020 15:17:38 +0200 |
From: Geoffrey McRae <geoff@hostfission.com>
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>
---
audio/jackaudio.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/audio/jackaudio.c b/audio/jackaudio.c
index 58c73444977e..249cbd3265c5 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 */
--
2.18.4
- [PULL 0/7] Audio 20200619 patches, Gerd Hoffmann, 2020/06/19
- [PULL 3/7] audio/jack: remove invalid set of input support bool, Gerd Hoffmann, 2020/06/19
- [PULL 4/7] audio/jack: do not remove ports when finishing,
Gerd Hoffmann <=
- [PULL 6/7] audio/jack: simplify the re-init code path, Gerd Hoffmann, 2020/06/19
- [PULL 2/7] audio/jack: remove unused stopped state, Gerd Hoffmann, 2020/06/19
- [PULL 1/7] audio/jack: fix invalid minimum buffer size check, Gerd Hoffmann, 2020/06/19
- [PULL 7/7] hw/audio/gus: Fix registers 32-bit access, Gerd Hoffmann, 2020/06/19
- [PULL 5/7] audio/jack: honour the enable state of the audio device, Gerd Hoffmann, 2020/06/19
- Re: [PULL 0/7] Audio 20200619 patches, no-reply, 2020/06/19
- Re: [PULL 0/7] Audio 20200619 patches, no-reply, 2020/06/19
- Re: [PULL 0/7] Audio 20200619 patches, Peter Maydell, 2020/06/22