Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TPF
jack2
Commits
f3cf9d6f
Commit
f3cf9d6f
authored
Dec 06, 2015
by
Stéphane Letz
Browse files
Merge pull request #162 from Jajcus/release-alsa-card-on-init-error
Release audio devices when alsa_driver_new fails
parents
dab7e50e
57e16b9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
linux/alsa/JackAlsaDriver.cpp
View file @
f3cf9d6f
...
...
@@ -346,7 +346,7 @@ int JackAlsaDriver::Open(jack_nframes_t nframes,
fPlaybackChannels
=
((
alsa_driver_t
*
)
fDriver
)
->
playback_nchannels
;
return
0
;
}
else
{
JackAudioDriver
::
Close
();
Close
();
return
-
1
;
}
}
...
...
@@ -356,7 +356,9 @@ int JackAlsaDriver::Close()
// Generic audio driver close
int
res
=
JackAudioDriver
::
Close
();
alsa_driver_delete
((
alsa_driver_t
*
)
fDriver
);
if
(
fDriver
)
{
alsa_driver_delete
((
alsa_driver_t
*
)
fDriver
);
}
if
(
JackServerGlobals
::
on_device_release
!=
NULL
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment