Changeset 238


Ignore:
Timestamp:
Feb 27, 2006 12:00:30 AM (18 years ago)
Author:
bennylp
Message:

Moved pjsua framework to pjsua-lib

Location:
pjproject/trunk/pjsip
Files:
3 added
1 deleted
3 edited
8 moved

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip/build/pjsip.dsw

    r213 r238  
    138138    Project_Dep_Name pjsip_simple 
    139139    End Project Dependency 
     140    Begin Project Dependency 
     141    Project_Dep_Name pjsua_lib 
     142    End Project Dependency 
     143}}} 
     144 
     145############################################################################### 
     146 
     147Project: "pjsua_lib"=.\pjsua_lib.dsp - Package Owner=<4> 
     148 
     149Package=<5> 
     150{{{ 
     151}}} 
     152 
     153Package=<4> 
     154{{{ 
    140155}}} 
    141156 
  • pjproject/trunk/pjsip/build/pjsua.dsp

    r236 r238  
    9191# Begin Source File 
    9292 
    93 SOURCE=..\src\pjsua\getopt.c 
    94 # End Source File 
    95 # Begin Source File 
    96  
    9793SOURCE=..\src\pjsua\main.c 
    98 # End Source File 
    99 # Begin Source File 
    100  
    101 SOURCE=..\src\pjsua\pjsua_call.c 
    102 # End Source File 
    103 # Begin Source File 
    104  
    105 SOURCE=..\src\pjsua\pjsua_core.c 
    106 # End Source File 
    107 # Begin Source File 
    108  
    109 SOURCE=..\src\pjsua\pjsua_opt.c 
    110 # End Source File 
    111 # Begin Source File 
    112  
    113 SOURCE=..\src\pjsua\pjsua_pres.c 
    114 # End Source File 
    115 # Begin Source File 
    116  
    117 SOURCE=..\src\pjsua\pjsua_reg.c 
    11894# End Source File 
    11995# End Group 
     
    12197 
    12298# PROP Default_Filter "h;hpp;hxx;hm;inl" 
    123 # Begin Source File 
    124  
    125 SOURCE=..\src\pjsua\getopt.h 
    126 # End Source File 
    127 # Begin Source File 
    128  
    129 SOURCE=..\src\pjsua\pjsua.h 
    130 # End Source File 
    13199# End Group 
    132100# Begin Group "Resource Files" 
  • pjproject/trunk/pjsip/src/pjsua-lib/getopt.c

    r237 r238  
    2626 */ 
    2727 
    28 #include "getopt.h" 
     28#include <pjsua-lib/getopt.h> 
    2929#include <pj/string.h> 
    3030 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

    r236 r238  
    1717 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
    1818 */ 
    19 #include "pjsua.h" 
     19#include <pjsua-lib/pjsua.h> 
    2020#include <pj/log.h> 
    2121 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_core.c

    r236 r238  
    1717 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
    1818 */ 
    19 #include "pjsua.h" 
     19#include <pjsua-lib/pjsua.h> 
    2020 
    2121/* 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_opt.c

    r236 r238  
    1717 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
    1818 */ 
    19 #include "pjsua.h" 
    20 #include "getopt.h" 
    21 #include <stdlib.h> 
     19#include <pjsua-lib/pjsua.h> 
     20#include <pjsua-lib/getopt.h> 
    2221 
    2322#define THIS_FILE   "pjsua_opt.c" 
     
    190189    return 0; 
    191190 
     191} 
     192 
     193static int my_atoi(const char *cs) 
     194{ 
     195    pj_str_t s; 
     196    return pj_strtoul(pj_cstr(&s, cs)); 
    192197} 
    193198 
     
    459464 
    460465        case OPT_AUTO_ANSWER: 
    461             pjsua.auto_answer = atoi(optarg); 
     466            pjsua.auto_answer = my_atoi(optarg); 
    462467            if (pjsua.auto_answer < 100 || pjsua.auto_answer > 699) { 
    463468                puts("Error: invalid code in --auto-answer (expecting 100-699"); 
     
    467472 
    468473        case OPT_MAX_CALLS: 
    469             pjsua.max_calls = atoi(optarg); 
     474            pjsua.max_calls = my_atoi(optarg); 
    470475            if (pjsua.max_calls < 1 || pjsua.max_calls > 255) { 
    471476                puts("Too many calls for max-calls (1-255)"); 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_pres.c

    r236 r238  
    1717 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
    1818 */ 
    19 #include "pjsua.h" 
     19#include <pjsua-lib/pjsua.h> 
    2020 
    2121/* 
  • pjproject/trunk/pjsip/src/pjsua-lib/pjsua_reg.c

    r236 r238  
    1717 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
    1818 */ 
    19 #include "pjsua.h" 
     19#include <pjsua-lib/pjsua.h> 
    2020 
    2121 
  • pjproject/trunk/pjsip/src/pjsua/main.c

    r236 r238  
    1717 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA  
    1818 */ 
    19 #include "pjsua.h" 
     19#include <pjsua-lib/pjsua.h> 
    2020#include <stdlib.h> 
    2121 
Note: See TracChangeset for help on using the changeset viewer.