Commit 00125cf3 authored by Sandrine Avakian's avatar Sandrine Avakian

Update of a few files to use ms_factory_get_snd_manager instead of ms_snd_card_manager_get

parent c8a2aec2
...@@ -94,11 +94,11 @@ int main(int argc, char *argv[]){ ...@@ -94,11 +94,11 @@ int main(int argc, char *argv[]){
} }
if (capt_card) if (capt_card)
card_capture = ms_snd_card_manager_get_card(ms_snd_card_manager_get(),capt_card); card_capture = ms_snd_card_manager_get_card(ms_factory_get_snd_manager(factory),capt_card);
else card_capture = ms_snd_card_manager_get_default_capture_card(ms_snd_card_manager_get()); else card_capture = ms_snd_card_manager_get_default_capture_card(ms_factory_get_snd_manager(factory));
if (play_card) if (play_card)
card_playback = ms_snd_card_manager_get_card(ms_snd_card_manager_get(),play_card); card_playback = ms_snd_card_manager_get_card(ms_factory_get_snd_manager(factory),play_card);
else card_playback = ms_snd_card_manager_get_default_playback_card(ms_snd_card_manager_get()); else card_playback = ms_snd_card_manager_get_default_playback_card(ms_factory_get_snd_manager(factory));
if (card_playback==NULL || card_capture==NULL){ if (card_playback==NULL || card_capture==NULL){
ms_error("No card."); ms_error("No card.");
......
...@@ -788,7 +788,7 @@ void setup_media_streams(MediastreamDatas* args) { ...@@ -788,7 +788,7 @@ void setup_media_streams(MediastreamDatas* args) {
} }
if (args->pt->type!=PAYLOAD_VIDEO){ if (args->pt->type!=PAYLOAD_VIDEO){
MSSndCardManager *manager=ms_snd_card_manager_get(); MSSndCardManager *manager=ms_factory_get_snd_manager(factory);
MSSndCard *capt= args->capture_card==NULL ? ms_snd_card_manager_get_default_capture_card(manager) : MSSndCard *capt= args->capture_card==NULL ? ms_snd_card_manager_get_default_capture_card(manager) :
get_sound_card(manager,args->capture_card); get_sound_card(manager,args->capture_card);
MSSndCard *play= args->playback_card==NULL ? ms_snd_card_manager_get_default_capture_card(manager) : MSSndCard *play= args->playback_card==NULL ? ms_snd_card_manager_get_default_capture_card(manager) :
......
...@@ -42,7 +42,7 @@ int main(int argc, char *argv[]){ ...@@ -42,7 +42,7 @@ int main(int argc, char *argv[]){
card_id=argv[2]; card_id=argv[2];
} }
sc=ms_snd_card_manager_get_card(ms_snd_card_manager_get(),card_id); sc=ms_snd_card_manager_get_card(ms_factory_get_snd_manager(factory),card_id);
#ifdef __linux #ifdef __linux
if (sc==NULL) if (sc==NULL)
sc = ms_alsa_card_new_custom(card_id, card_id); sc = ms_alsa_card_new_custom(card_id, card_id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment