Changeset 254

Timestamp:

Mar 1, 2006 7:31:18 PM (18 years ago)

Author:

bennylp

Message:

Added pjsip-apps top level projects

Location:

pjproject/trunk

Files:

• Makefile (modified) (2 diffs)
• pjsip-apps (added)
• pjsip-apps/bin (added)
• pjsip-apps/build (added)
• pjsip-apps/build/Makefile (added)
• pjsip-apps/build/os-win32.mak (copied) (copied from pjproject/trunk/pjsip/build/os-win32.mak)
• pjsip-apps/build/output (added)
• pjsip-apps/build/pjsip_apps.dsw (added)
• pjsip-apps/build/pjsip_perf.dsp (added)
• pjsip-apps/build/pjsua.dsp (copied) (copied from pjproject/trunk/pjsip/build/pjsua.dsp) (2 diffs)
• pjsip-apps/docs (added)
• pjsip-apps/src (added)
• pjsip-apps/src/pjsip-perf (added)
• pjsip-apps/src/pjsip-perf/handler_call.c (added)
• pjsip-apps/src/pjsip-perf/handler_options.c (added)
• pjsip-apps/src/pjsip-perf/main.c (added)
• pjsip-apps/src/pjsip-perf/pjsip_perf.h (added)
• pjsip-apps/src/pjsua (copied) (copied from pjproject/trunk/pjsip/src/pjsua)
• pjsip-apps/src/pjsua/main.c (modified) (6 diffs)

pjproject/trunk/Makefile

@@ -2 +2 @@
 include build/host-$(HOST_NAME).mak
 
-DIRS = pjlib pjlib-util pjmedia pjsip
+DIRS = pjlib pjlib-util pjmedia pjsip pjsip-apps
 
 ifdef MINSIZE
@@ -22 +22 @@
         pjlib-util/lib/libpjlib-util-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
         pjmedia/lib/libpjmedia-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
+        pjmedia/lib/libpjmedia-codec-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
         pjsip/lib/libpjsip-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
-        pjsip/lib/libpjsip-ua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a
-BINS =  pjsip/bin/pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE) 
+        pjsip/lib/libpjsip-ua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
+        pjsip/lib/libpjsip-simple-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a \
+        pjsip/lib/libpjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME).a
+BINS =  pjsip-apps/bin/pjsua-$(MACHINE_NAME)-$(OS_NAME)-$(CC_NAME)$(HOST_EXE) 
 
 size:

pjproject/trunk/pjsip-apps/build/pjsua.dsp

@@ -43 +43 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
+# ADD CPP /nologo /MD /W4 /GX /Zi /O2 /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /D "NDEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -69 +69 @@
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# ADD CPP /nologo /MTd /W4 /Gm /GX /ZI /Od /I "../../pjsip/include" /I "../../pjlib/include" /I "../../pjlib-util/include" /I "../../pjmedia/include" /D "_DEBUG" /D PJ_WIN32=1 /D PJ_M_I386=1 /D "WIN32" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"

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

@@ -18 +18 @@
  */
 #include <pjsua-lib/pjsua.h>
-#include <stdlib.h>
+#include <stdlib.h>             /* atoi */
 
 
@@ -208 +208 @@
     puts("|                              |                          |                   |");
     puts("|  m  Make new call            |  i  Send IM              |  o  Send OPTIONS  |");
-    puts("|  a  Answer call              |  s  Subscribe presence   | rr  (Re-)register |");
-    puts("|  h  Hangup call              |  u  Unsubscribe presence | ru  Unregister    |");
-    puts("|  ]  Select next dialog       |  t  ToGgle Online status |  d  Dump status   |");
-    puts("|  [  Select previous dialog   |                          | dc  Dump config   |");
-    puts("|                              +--------------------------+-------------------+");
-    puts("|  H  Hold call                |     Conference Command   |                   |");
-    puts("|  v  re-inVite (release hold) | cl  List ports           |                   |");
+    puts("|  M  Make multiple calls      |  s  Subscribe presence   | rr  (Re-)register |");
+    puts("|  a  Answer call              |  u  Unsubscribe presence | ru  Unregister    |");
+    puts("|  h  Hangup call              |  t  ToGgle Online status |  d  Dump status   |");
+    puts("|  H  Hold call                |                          | dc  Dump config   |");
+    puts("|  v  re-inVite (release hold) +--------------------------+-------------------+");
+    puts("|  ]  Select next dialog       |     Conference Command   |                   |");
+    puts("|  [  Select previous dialog   | cl  List ports           |                   |");
     puts("|  x  Xfer call                | cc  Connect port         |                   |");
     puts("|  #  Send DTMF string         | cd  Disconnect port      |                   |");
@@ -220 +220 @@
     puts("|  q  QUIT                                                                    |");
     puts("+=============================================================================+");
-    printf(">>> ");
-
-
-    fflush(stdout);
 }
 
@@ -373 +369 @@
     char menuin[10];
     char buf[128];
+    int i, count;
+    char *uri;
     struct input_result result;
 
-    //keystroke_help();
+    keystroke_help();
 
     for (;;) {
 
-        keystroke_help();
+        printf(">>> ");
+        fflush(stdout);
+
         fgets(menuin, sizeof(menuin), stdin);
 
@@ -401 +401 @@
             break;
 
+        case 'M':
+            /* Make multiple calls! : */
+            printf("(You currently have %d calls)\n", pjsua.call_cnt);
+            
+            ui_input_url("Make call", buf, sizeof(buf), &result);
+            if (result.nb_result != NO_NB) {
+                if (result.nb_result == -1) {
+                    puts("You can't do that with make call!");
+                    continue;
+                }
+                uri = pjsua.buddies[result.nb_result].uri.ptr;
+            } else {
+                uri =  result.uri_result;
+            }
+
+            if (!simple_input("Number of calls", menuin, sizeof(menuin)))
+                continue;
+
+            count = atoi(menuin);
+            if (count < 1)
+                continue;
+
+            for (i=0; i<atoi(menuin); ++i) {
+                pj_status_t status;
+
+                status = pjsua_make_call(current_acc, uri, NULL);
+                if (status != PJ_SUCCESS)
+                    break;
+            }
+            break;
 
         case 'a':
@@ -702 +732 @@
         case 'q':
             goto on_exit;
+
+        default:
+            keystroke_help();
+            break;
         }
     }