mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-monitor: don't crash when dbus connection failed

Browse source
This commit is contained in:
Wim Taymans 2020-01-14 10:53:12 +01:00
parent 3d8c8b4a85
commit c624ca7591
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/examples/media-session/alsa-monitor.c
View file

@ -484,6 +484,7 @@ static void sync_complete_done(void *data, int seq)
spa_hook_remove(&device->sync_listener); spa_hook_remove(&device->sync_listener);
device->seq = 0; device->seq = 0;
if (device->reserve)
rd_device_complete_release(device->reserve, true); rd_device_complete_release(device->reserve, true);
add_jack_timeout(impl); add_jack_timeout(impl);
@ -617,7 +618,8 @@ static struct device *alsa_create_device(struct impl *impl, uint32_t id,
&device->listener, &device->listener,
&device_events, device); &device_events, device);
if ((card = spa_dict_lookup(info->props, SPA_KEY_API_ALSA_CARD)) != NULL) { if (impl->conn &&
(card = spa_dict_lookup(info->props, SPA_KEY_API_ALSA_CARD)) != NULL) {
const char *reserve; const char *reserve;
pw_properties_setf(device->props, "api.dbus.ReserveDevice1", "Audio%s", card); pw_properties_setf(device->props, "api.dbus.ReserveDevice1", "Audio%s", card);
@ -759,6 +761,7 @@ int sm_alsa_monitor_start(struct sm_media_session *session)
else else
pw_log_debug("got dbus connection %p", impl->conn); pw_log_debug("got dbus connection %p", impl->conn);
impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_ALSA_ENUM_UDEV, NULL); impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_ALSA_ENUM_UDEV, NULL);
if (impl->handle == NULL) { if (impl->handle == NULL) {
res = -errno; res = -errno;