From c08134536c87207f2e18e946e12c47fda92228cb Mon Sep 17 00:00:00 2001 From: Marco Bascetta Date: Wed, 24 Jan 2018 09:13:17 +0100 Subject: [PATCH 22/23] tools/mediastream: permits NULL cards and in/out files. --- tools/mediastream.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/mediastream.c b/tools/mediastream.c index 94c42ebe..09b230a6 100644 --- a/tools/mediastream.c +++ b/tools/mediastream.c @@ -850,9 +850,9 @@ void setup_media_streams(MediastreamDatas* args) { if (args->pt->type!=PAYLOAD_VIDEO){ MSSndCardManager *manager=ms_factory_get_snd_card_manager(factory); - MSSndCard *capt= args->capture_card==NULL ? ms_snd_card_manager_get_default_capture_card(manager) : + MSSndCard *capt= args->capture_card==NULL ? NULL : 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 ? NULL : get_sound_card(manager,args->playback_card); args->audio = audio_stream_new3(factory, args->localip, args->localport,args->enable_rtcp ? args->localport+1 : -1, get_rtp_session_mode(args)); if (args->bw_controller){ @@ -869,8 +869,8 @@ void setup_media_streams(MediastreamDatas* args) { ms_snd_card_set_preferred_sample_rate(play,rtp_profile_get_payload(args->profile, args->payload)->clock_rate); ms_message("Starting audio stream.\n"); - audio_stream_start_full(args->audio,args->profile,args->ip,args->remoteport,args->ip,args->enable_rtcp?args->remoteport+1:-1, args->payload, args->jitter,args->infile,args->outfile, - args->outfile==NULL ? play : NULL ,args->infile==NULL ? capt : NULL,args->infile!=NULL ? FALSE: args->ec); + audio_stream_start_full(args->audio,args->profile,args->ip,args->remoteport,args->ip,args->enable_rtcp?args->remoteport+1:-1, args->payload, args->jitter, + args->infile, args->outfile, play, capt, args->ec); if (args->ice_local_candidates_nb || args->ice_remote_candidates_nb) { args->audio->ms.ice_check_list = ice_check_list_new(); -- 2.11.0