From 1b7f53849df61d161cdd0233815e46af2f358e23 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 11 Feb 2016 15:51:06 +0100 Subject: [PATCH] improve soundcard management --- coreapi/linphonecore.c | 10 ++-------- mediastreamer2 | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index f4c7e4e07..f1f808514 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -4520,10 +4520,7 @@ static MSSndCard *get_card_from_string_id(const char *devid, unsigned int cap, M * @param devid the device name as returned by linphone_core_get_sound_devices() **/ bool_t linphone_core_sound_device_can_capture(LinphoneCore *lc, const char *devid){ - MSSndCard *sndcard; - sndcard=ms_snd_card_manager_get_card(ms_factory_get_snd_card_manager(lc->factory),devid); - if (sndcard!=NULL && (ms_snd_card_get_capabilities(sndcard) & MS_SND_CARD_CAP_CAPTURE)) return TRUE; - return FALSE; + return ms_snd_card_manager_get_capture_card(ms_factory_get_snd_card_manager(lc->factory),devid) != NULL; } /** @@ -4534,10 +4531,7 @@ bool_t linphone_core_sound_device_can_capture(LinphoneCore *lc, const char *devi * @param devid the device name as returned by linphone_core_get_sound_devices() **/ bool_t linphone_core_sound_device_can_playback(LinphoneCore *lc, const char *devid){ - MSSndCard *sndcard; - sndcard=ms_snd_card_manager_get_card(ms_factory_get_snd_card_manager(lc->factory),devid); - if (sndcard!=NULL && (ms_snd_card_get_capabilities(sndcard) & MS_SND_CARD_CAP_PLAYBACK)) return TRUE; - return FALSE; + return ms_snd_card_manager_get_playback_card(ms_factory_get_snd_card_manager(lc->factory),devid) != NULL; } /** diff --git a/mediastreamer2 b/mediastreamer2 index bf4f672f0..7b3f7cb2c 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit bf4f672f0a97100318970a8e9a7290fd730a79b6 +Subproject commit 7b3f7cb2c84a67226e06cb8f0e9ec2973e51d6e0