Changeset 2674


Ignore:
Timestamp:
May 6, 2009 10:28:52 AM (15 years ago)
Author:
bennylp
Message:

Part of #706, #809: fix Python module build error and added python_pjsua to the main .sln

Location:
pjproject/trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/pjproject-vs8.sln

    r2660 r2674  
    186186                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} 
    187187                {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D} 
     188        EndProjectSection 
     189EndProject 
     190Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python_pjsua", "pjsip-apps\build\python_pjsua.vcproj", "{0C91838B-3372-40B4-A764-DE075A4BC94B}" 
     191        ProjectSection(ProjectDependencies) = postProject 
     192                {23D7679C-764C-4E02-8B29-BB882CEEEFE2} = {23D7679C-764C-4E02-8B29-BB882CEEEFE2} 
    188193        EndProjectSection 
    189194EndProject 
    … …  
    27942799                {23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release-Static|Windows Mobile 6 Standard SDK (ARMV4I) 
    27952800                {23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release-Static|Windows Mobile 6 Standard SDK (ARMV4I) 
     2801                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 
     2802                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32 
     2803                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Win32.ActiveCfg = Debug|Win32 
     2804                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2805                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2806                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2807                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2808                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 
     2809                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32 
     2810                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32 
     2811                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2812                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2813                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2814                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2815                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 
     2816                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32 
     2817                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Win32.ActiveCfg = Debug|Win32 
     2818                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2819                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2820                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2821                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32 
     2822                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 
     2823                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32 
     2824                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Win32.ActiveCfg = Release|Win32 
     2825                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 
     2826                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32 
     2827                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32 
     2828                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32 
     2829                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 
     2830                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32 
     2831                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Win32.ActiveCfg = Release|Win32 
     2832                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 
     2833                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32 
     2834                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32 
     2835                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32 
     2836                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 
     2837                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32 
     2838                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Win32.ActiveCfg = Release|Win32 
     2839                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 
     2840                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32 
     2841                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32 
     2842                {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32 
    27962843        EndGlobalSection 
    27972844        GlobalSection(SolutionProperties) = preSolution 

  • pjproject/trunk/pjsip-apps/build/pjsip_apps.dsw

    r2567 r2674  
    44############################################################################### 
    55 
     6Project: "libg7221codec"="..\..\third_party\build\g7221\libg7221codec.dsp" - Package Owner=<4> 
     7 
     8Package=<5> 
     9{{{ 
     10}}} 
     11 
     12Package=<4> 
     13{{{ 
     14}}} 
     15 
     16############################################################################### 
     17 
    618Project: "libgsmcodec"="..\..\third_party\build\gsm\libgsmcodec.dsp" - Package Owner=<4> 
    719 
    … …  
    240252    Project_Dep_Name libsrtp 
    241253    End Project Dependency 
     254    Begin Project Dependency 
     255    Project_Dep_Name libg7221codec 
     256    End Project Dependency 
    242257}}} 
    243258 
    … …  
    312327    Project_Dep_Name pjmedia_audiodev 
    313328    End Project Dependency 
     329    Begin Project Dependency 
     330    Project_Dep_Name libg7221codec 
     331    End Project Dependency 
    314332}}} 
    315333 
    … …  
    412430############################################################################### 
    413431 
    414 Project: "test_pjsip"="..\..\pjsip\build\test_pjsip.dsp" - Package Owner=<4> 
    415  
    416 Package=<5> 
    417 {{{ 
    418 }}} 
    419  
    420 Package=<4> 
    421 {{{ 
    422     Begin Project Dependency 
    423     Project_Dep_Name pjlib 
    424     End Project Dependency 
    425     Begin Project Dependency 
    426     Project_Dep_Name pjlib_util 
    427     End Project Dependency 
    428     Begin Project Dependency 
    429     Project_Dep_Name pjmedia 
    430     End Project Dependency 
    431     Begin Project Dependency 
    432     Project_Dep_Name pjsip_core 
    433     End Project Dependency 
    434     Begin Project Dependency 
    435     Project_Dep_Name pjsip_simple 
    436     End Project Dependency 
    437     Begin Project Dependency 
    438     Project_Dep_Name pjsip_ua 
    439     End Project Dependency 
    440 }}} 
    441  
    442 ############################################################################### 
    443  
    444432Global: 
    445433 

  • pjproject/trunk/pjsip-apps/src/py_pjsua/py_pjsua.c

    r2394 r2674  
    37673767    obj->info->pt = param.info.pt; 
    37683768    obj->setting->cng = param.setting.cng; 
    3769     obj->setting->dec_fmtp_mode = param.setting.dec_fmtp_mode; 
    3770     obj->setting->enc_fmtp_mode = param.setting.enc_fmtp_mode; 
     3769    //deprecated: 
     3770    //obj->setting->dec_fmtp_mode = param.setting.dec_fmtp_mode; 
     3771    //obj->setting->enc_fmtp_mode = param.setting.enc_fmtp_mode; 
    37713772    obj->setting->frm_per_pkt = param.setting.frm_per_pkt; 
    37723773    obj->setting->penh = param.setting.penh; 
    … …  
    38103811        param.info.pt = obj->info->pt; 
    38113812        param.setting.cng = obj->setting->cng; 
    3812         param.setting.dec_fmtp_mode = obj->setting->dec_fmtp_mode; 
    3813         param.setting.enc_fmtp_mode = obj->setting->enc_fmtp_mode; 
     3813        //Deprecated: 
     3814        //param.setting.dec_fmtp_mode = obj->setting->dec_fmtp_mode; 
     3815        //param.setting.enc_fmtp_mode = obj->setting->enc_fmtp_mode; 
    38143816        param.setting.frm_per_pkt = obj->setting->frm_per_pkt; 
    38153817        param.setting.penh = obj->setting->penh; 
Note: See TracChangeset for help on using the changeset viewer.