Changeset 903 for pjproject/trunk

Timestamp:

Jan 24, 2007 12:44:26 AM (18 years ago)

Author:

bennylp

Message:

Implement ticket #77: allow specifying multiple files in pjsua

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

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

@@ -59 +59 @@
     pj_str_t                codec_arg[32];
     pj_bool_t               null_audio;
-    pj_str_t                wav_file;
+    unsigned                wav_count;
+    pj_str_t                wav_files[32];
     pjsua_player_id         wav_id;
     pjsua_conf_port_id      wav_port;
@@ -678 +679 @@
 
         case OPT_PLAY_FILE:
-            cfg->wav_file = pj_str(pj_optarg);
+            cfg->wav_files[cfg->wav_count++] = pj_str(pj_optarg);
             break;
 
@@ -1131 +1132 @@
     if (config->auto_conf)
         pj_strcat2(&cfg, "--auto-conf\n");
-    if (config->wav_file.slen) {
+    for (i=0; i<config->wav_count; ++i) {
         pj_ansi_sprintf(line, "--play-file %s\n",
-                        config->wav_file.ptr);
+                        config->wav_files[i].ptr);
         pj_strcat2(&cfg, line);
     }
@@ -2911 +2912 @@
 
     /* Optionally registers WAV file */
-    if (app_config.wav_file.slen) {
-        status = pjsua_player_create(&app_config.wav_file, 0, 
-                                     &app_config.wav_id);
+    for (i=0; i<app_config.wav_count; ++i) {
+        pjsua_player_id wav_id;
+
+        status = pjsua_player_create(&app_config.wav_files[i], 0, 
+                                     &wav_id);
         if (status != PJ_SUCCESS)
             goto on_error;
 
-        app_config.wav_port = pjsua_player_get_conf_port(app_config.wav_id);
+        if (app_config.wav_id == 0) {
+            app_config.wav_id = wav_id;
+            app_config.wav_port = pjsua_player_get_conf_port(app_config.wav_id);
+        }
     }
 

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

@@ -759 +759 @@
         pjmedia_port_destroy(port);
         PJSUA_UNLOCK();
+        pjsua_perror(THIS_FILE, "Unable to add file to conference bridge", 
+                     status);
         return status;
     }