Changeset 648 for pjproject/trunk/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp

Timestamp:

Aug 4, 2006 6:27:19 PM (18 years ago)

Author:

bennylp

Message:

More work on the AEC (including changes in PJSUA), embed the AEC in sound_port, reduce DirectSound? buffer from 32 to 16, and fixed ARM compilation for MSVC WinCE target.

File:

• pjproject/trunk/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp (modified) (17 diffs)

pjproject/trunk/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp

@@ -13 +13 @@
 static HWND         hMainWnd;
 static HWND         hwndCB;
-static HWND         hwndGlobalStatus;
-static HWND         hwndURI;
-static HWND         hwndCallStatus;
+static HWND         hwndGlobalStatus, hwndURI, hwndCallStatus;
+static HWND         hwndActionButton, hwndExitButton;
 
 static pj_pool_t   *g_pool;
@@ -21 +20 @@
 static int          g_current_acc;
 static int          g_current_call = PJSUA_INVALID_ID;
+static int          g_current_action;
 
 enum
@@ -36 +36 @@
     ID_MENU_ANSWER,
     ID_MENU_DISCONNECT,
+    ID_BTN_ACTION,
 };
+
+#define DEFAULT_URI     "sip:192.168.0.7"
 
 
@@ -64 +67 @@
 {
     wchar_t tmp[128];
+    if (len==-1) len=pj_ansi_strlen(uri);
     pj_ansi_to_unicode(uri, len, tmp, PJ_ARRAY_SIZE(tmp));
     SetDlgItemText(hMainWnd, ID_GLOBAL_STATUS, tmp);
@@ -74 +78 @@
 {
     wchar_t tmp[128];
+    if (len==-1) len=pj_ansi_strlen(uri);
     pj_ansi_to_unicode(uri, len, tmp, PJ_ARRAY_SIZE(tmp));
     SetDlgItemText(hMainWnd, ID_URI, tmp);
@@ -83 +88 @@
 {
     wchar_t tmp[128];
+    if (len==-1) len=pj_ansi_strlen(state);
     pj_ansi_to_unicode(state, len, tmp, PJ_ARRAY_SIZE(tmp));
     SetDlgItemText(hMainWnd, ID_CALL_STATUS, tmp);
@@ -101 +107 @@
     case ID_MENU_NONE:
         InsertMenu(hMenu, ID_EXIT, MF_BYCOMMAND, action, TEXT("None"));
+        SetWindowText(hwndActionButton, TEXT("-"));
         break;
     case ID_MENU_CALL:
         InsertMenu(hMenu, ID_EXIT, MF_BYCOMMAND, action, TEXT("Call"));
+        SetWindowText(hwndActionButton, TEXT("&Call"));
         break;
     case ID_MENU_ANSWER:
         InsertMenu(hMenu, ID_EXIT, MF_BYCOMMAND, action, TEXT("Answer"));
+        SetWindowText(hwndActionButton, TEXT("&Answer"));
         break;
     case ID_MENU_DISCONNECT:
         InsertMenu(hMenu, ID_EXIT, MF_BYCOMMAND, action, TEXT("Hangup"));
+        SetWindowText(hwndActionButton, TEXT("&Hangup"));
         break;
     }
 
     EnableMenuItem(hMenu, action, MF_BYCOMMAND | (enable?MF_ENABLED:MF_GRAYED));
+    DrawMenuBar(hMainWnd);
+
+    g_current_action = action;
 }
 
@@ -131 +144 @@
 
         g_current_call = PJSUA_INVALID_ID;
-        SetURI("sip:", 4);
+        SetURI(DEFAULT_URI, -1);
         SetAction(ID_MENU_CALL);
-        SetCallStatus(call_info.state_text.ptr, call_info.state_text.slen);
+        //SetCallStatus(call_info.state_text.ptr, call_info.state_text.slen);
+        SetCallStatus(call_info.last_status_text.ptr, call_info.last_status_text.slen);
 
     } else {
@@ -259 +273 @@
     pjsua_media_config_default(&media_cfg);
     pjsua_transport_config_default(&udp_cfg);
+    udp_cfg.port = 50060;
     pjsua_transport_config_default(&rtp_cfg);
+    rtp_cfg.port = 40000;
 
     /* Setup media */
@@ -388 +404 @@
     LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
     hWnd = CreateWindow(szWindowClass, szTitle, WS_VISIBLE,
-            CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 
+            CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, 200, 
             NULL, NULL, hInstance, NULL);
 
@@ -412 +428 @@
     {
         X = 10,
+        Y = 40,
         W = 220,
         H = 30,
@@ -431 +448 @@
                 dwStyle,        // Window style
                 X,              // x-coordinate of the upper-left corner
-                60,            // y-coordinate of the upper-left corner
+                Y+0,            // y-coordinate of the upper-left corner
                 W,              // Width of the window for the edit
                                 // control
-                H,              // Height of the window for the edit
+                H-5,            // Height of the window for the edit
                                 // control
                 hWnd,           // Window handle to the parent window
@@ -451 +468 @@
                 dwStyle,        // Window style
                 X,  // x-coordinate of the upper-left corner
-                100,  // y-coordinate of the upper-left corner
+                Y+H,  // y-coordinate of the upper-left corner
                 W,  // Width of the window for the edit
                                 // control
-                H,  // Height of the window for the edit
+                H-5,  // Height of the window for the edit
                                 // control
                 hWnd,           // Window handle to the parent window
@@ -461 +478 @@
                 NULL);          // Specify NULL for this parameter when 
                                 // you create a control
-    SetURI("sip:", 4, true);
-    SetFocus(hwndURI);
+
+    // Create action Button
+    hwndActionButton = CreateWindow( L"button", L"Action", 
+                         WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON, 
+                         X, Y+2*H, 
+                         60, H-5, hWnd, 
+                         (HMENU) ID_BTN_ACTION,
+                         hInst, NULL );
+
+    // Create exit button
+    hwndExitButton = CreateWindow( L"button", L"E&xit", 
+                         WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON, 
+                         X+70, Y+2*H, 
+                         60, H-5, hWnd, 
+                         (HMENU) ID_EXIT,
+                         hInst, NULL );
+
 
     // Create call status edit
@@ -471 +503 @@
                 dwStyle,        // Window style
                 X,  // x-coordinate of the upper-left corner
-                140,  // y-coordinate of the upper-left corner
+                Y+3*H,  // y-coordinate of the upper-left corner
                 W,  // Width of the window for the edit
                                 // control
-                H,  // Height of the window for the edit
+                H-5,  // Height of the window for the edit
                                 // control
                 hWnd,           // Window handle to the parent window
@@ -482 +514 @@
                                 // you create a control
     SetCallStatus("Ready", 5);
-
     SetAction(ID_MENU_CALL);
+    SetURI(DEFAULT_URI, -1);
+    SetFocus(hwndURI);
+
 }
 
@@ -500 +534 @@
         wmId    = LOWORD(wParam); 
         wmEvent = HIWORD(wParam); 
+        if (wmId == ID_BTN_ACTION)
+            wmId = g_current_action;
         switch (wmId)
         {