Changeset 507

Timestamp:

Jun 14, 2006 8:04:55 PM (18 years ago)

Author:

bennylp

Message:

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

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua.c (modified) (3 diffs)
• pjsip-apps/src/samples/streamutil.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua.c

@@ -587 +587 @@
             cfg->duration = my_atoi(pj_optarg);
             break;
+
+        default:
+            PJ_LOG(1,(THIS_FILE, "Invalid argument %s", argv[pj_optind-1]));
+            return -1;
         }
     }
@@ -2069 +2073 @@
         if (status != PJ_SUCCESS)
             goto on_error;
+
+        app_config.wav_port = pjsua_player_get_conf_port(app_config.wav_id);
     }
 
@@ -2109 +2115 @@
         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;
 

pjproject/trunk/pjsip-apps/src/samples/streamutil.c

@@ -476 +476 @@
      */
     if (master_port) {
-        pjmedia_master_port_destroy(master_port);
+        pjmedia_master_port_destroy(master_port, PJ_TRUE);
         play_file_port = NULL;
         stream = NULL;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -327 +327 @@
 
     /* Create sound port if none is created yet */
-    if (pjsua_var.snd_port == NULL) {
+    if (pjsua_var.snd_port==NULL && pjsua_var.null_snd==NULL) {
         status = pjsua_set_snd_dev(pjsua_var.cap_dev, pjsua_var.play_dev);
         if (status != PJ_SUCCESS) {