diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-16 18:35:53 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-16 18:35:53 +0200 |
| commit | 4bb2b140e9bc2b4ec98fee84796d5fb98d41f965 (patch) | |
| tree | fbe31659ff9fc68c38f3f6d3f462fd2692fa051d /ext/jack | |
| parent | dfd91ba704f5d84774c4ea72ed119dde537c90b6 (diff) | |
| parent | 6ac7ad8a2ce59bebcb5b5085fa48c354afff539f (diff) | |
Merge branch 'master' into 0.11
Conflicts:
sys/v4l2/v4l2src_calls.c
Diffstat (limited to 'ext/jack')
| -rw-r--r-- | ext/jack/gstjackaudiosrc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/jack/gstjackaudiosrc.c b/ext/jack/gstjackaudiosrc.c index ac7e7f3e3..5f18f4339 100644 --- a/ext/jack/gstjackaudiosrc.c +++ b/ext/jack/gstjackaudiosrc.c @@ -355,12 +355,12 @@ gst_jack_ring_buffer_open_device (GstRingBuffer * buf) /* ERRORS */ could_not_open: { - if (status & JackServerFailed) { + if (status & (JackServerFailed | JackFailure)) { GST_ELEMENT_ERROR (src, RESOURCE, NOT_FOUND, (_("Jack server not found")), ("Cannot connect to the Jack server (status %d)", status)); } else { - GST_ELEMENT_ERROR (src, RESOURCE, OPEN_WRITE, + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL), ("Jack client open error (status %d)", status)); } return FALSE; |