Ignore:
Timestamp:
Apr 28, 2009 7:38:43 PM (15 years ago)
Author:
nanang
Message:

Ticket #706: Merged branch vs-reorg2 into trunk:

  • Currently supported platforms are: Win32, WM6 std & pro, WM5 SP & PPC, WM2003 SP & PPC.
  • Added libpjproject into solution, this is a single 'combo' library that bundles all PJSIP libraries.
  • Cleaned up most of compile warnings, note that warning level of libgsmcodec has been reduced from 4 to 3.
Location:
pjproject/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk

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

    r2638 r2660  
    287287static void on_buddy_state(pjsua_buddy_id buddy_id) 
    288288{ 
     289    /* Currently this is not processed */ 
     290    PJ_UNUSED_ARG(buddy_id); 
    289291} 
    290292 
     
    297299                     const pj_str_t *mime_type, const pj_str_t *text) 
    298300{ 
     301    /* Currently this is not processed */ 
     302    PJ_UNUSED_ARG(call_id); 
     303    PJ_UNUSED_ARG(from); 
     304    PJ_UNUSED_ARG(to); 
     305    PJ_UNUSED_ARG(contact); 
     306    PJ_UNUSED_ARG(mime_type); 
     307    PJ_UNUSED_ARG(text); 
    299308} 
    300309 
     
    307316                      pj_bool_t is_typing) 
    308317{ 
     318    /* Currently this is not processed */ 
     319    PJ_UNUSED_ARG(call_id); 
     320    PJ_UNUSED_ARG(from); 
     321    PJ_UNUSED_ARG(to); 
     322    PJ_UNUSED_ARG(contact); 
     323    PJ_UNUSED_ARG(is_typing); 
     324} 
     325 
     326/**  
     327 * Callback upon NAT detection completion  
     328 */ 
     329static void nat_detect_cb(const pj_stun_nat_detect_result *res) 
     330{ 
     331    if (res->status != PJ_SUCCESS) { 
     332        char msg[250]; 
     333        pj_ansi_snprintf(msg, sizeof(msg), "NAT detection failed: %s", 
     334                         res->status_text); 
     335        SetCallStatus(msg, pj_ansi_strlen(msg)); 
     336    } else { 
     337        char msg[250]; 
     338        pj_ansi_snprintf(msg, sizeof(msg), "NAT type is %s", 
     339                         res->nat_type_name); 
     340        SetCallStatus(msg, pj_ansi_strlen(msg)); 
     341    } 
    309342} 
    310343 
     
    363396    cfg.cb.on_pager = &on_pager; 
    364397    cfg.cb.on_typing = &on_typing; 
     398    cfg.cb.on_nat_detect = &nat_detect_cb; 
    365399 
    366400    if (SIP_PROXY) { 
     
    472506    MSG msg; 
    473507    HACCEL hAccelTable; 
    474      
    475  
     508 
     509    PJ_UNUSED_ARG(lpCmdLine); 
     510    PJ_UNUSED_ARG(hPrevInstance); 
    476511 
    477512    // Perform application initialization: 
     
    513548 
    514549    return RegisterClass(&wc); 
    515 } 
    516  
    517  
    518 /* Callback upon NAT detection completion */ 
    519 static void nat_detect_cb(const pj_stun_nat_detect_result *res) 
    520 { 
    521     if (res->status != PJ_SUCCESS) { 
    522         char msg[250]; 
    523         pj_ansi_snprintf(msg, sizeof(msg), "NAT detection failed: %s", 
    524                          res->status_text); 
    525         SetCallStatus(msg, pj_ansi_strlen(msg)); 
    526     } else { 
    527         char msg[250]; 
    528         pj_ansi_snprintf(msg, sizeof(msg), "NAT type is %s", 
    529                          res->nat_type_name); 
    530         SetCallStatus(msg, pj_ansi_strlen(msg)); 
    531     } 
    532550} 
    533551 
Note: See TracChangeset for help on using the changeset viewer.