Implement --null-audio, --auto-loop, etc. in pjsua

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@507 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 14 insertions, 1 deletions

diff --git a/pjsip-apps/src/pjsua/pjsua.c b/pjsip-apps/src/pjsua/pjsua.c
index 666779eb..4c829341 100644
--- a/pjsip-apps/src/pjsua/pjsua.c
+++ b/pjsip-apps/src/pjsua/pjsua.c
@@ -586,6 +586,10 @@ static pj_status_t parse_args(int argc, char *argv[],
 	case OPT_DURATION:
 	    cfg->duration = my_atoi(pj_optarg);
 	    break;
+
+	default:
+	    PJ_LOG(1,(THIS_FILE, "Invalid argument %s", argv[pj_optind-1]));
+	    return -1;
 	}
     }
 
@@ -2068,6 +2072,8 @@ pj_status_t app_init(int argc, char *argv[])
 				     &app_config.wav_id);
 	if (status != PJ_SUCCESS)
 	    goto on_error;
+
+	app_config.wav_port = pjsua_player_get_conf_port(app_config.wav_id);
     }
 
     /* Add UDP transport */
@@ -2108,6 +2114,13 @@ pj_status_t app_init(int argc, char *argv[])
     if (status != PJ_SUCCESS)
 	goto on_error;
 
+    /* Use null sound device? */
+    if (app_config.null_audio) {
+	status = pjsua_set_null_snd_dev();
+	if (status != PJ_SUCCESS)
+	    return status;
+    }
+
     return PJ_SUCCESS;
 
 on_error:
diff --git a/pjsip-apps/src/samples/streamutil.c b/pjsip-apps/src/samples/streamutil.c
index 9e593e11..29ba520e 100644
--- a/pjsip-apps/src/samples/streamutil.c
+++ b/pjsip-apps/src/samples/streamutil.c
@@ -475,7 +475,7 @@ on_exit:
      * in this case are file_port and stream_port).
      */
     if (master_port) {
-	pjmedia_master_port_destroy(master_port);
+	pjmedia_master_port_destroy(master_port, PJ_TRUE);
 	play_file_port = NULL;
 	stream = NULL;
     }