From b409e7527b5e16cadbc976a1066b9c69300ffc9b Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Wed, 6 May 2009 10:28:52 +0000 Subject: Part of #706, #809: fix Python module build error and added python_pjsua to the main .sln git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2674 74dad513-b988-da41-8d7b-12977e46ad98 --- pjproject-vs8.sln | 47 ++++++ pjsip-apps/build/pjsip_apps.dsw | 48 +++---- pjsip-apps/build/python_pjsua.vcproj | 268 +++++++++++++++++++++++++++++++++++ pjsip-apps/src/py_pjsua/py_pjsua.c | 10 +- 4 files changed, 339 insertions(+), 34 deletions(-) create mode 100644 pjsip-apps/build/python_pjsua.vcproj diff --git a/pjproject-vs8.sln b/pjproject-vs8.sln index 267a37b5..b6abbc1f 100644 --- a/pjproject-vs8.sln +++ b/pjproject-vs8.sln @@ -187,6 +187,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpjproject", "pjsip-apps\ {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python_pjsua", "pjsip-apps\build\python_pjsua.vcproj", "{0C91838B-3372-40B4-A764-DE075A4BC94B}" + ProjectSection(ProjectDependencies) = postProject + {23D7679C-764C-4E02-8B29-BB882CEEEFE2} = {23D7679C-764C-4E02-8B29-BB882CEEEFE2} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Pocket PC 2003 (ARMV4) = Debug|Pocket PC 2003 (ARMV4) @@ -2793,6 +2798,48 @@ Global {23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|Windows Mobile 6 Professional SDK (ARMV4I).Build.0 = Release-Static|Windows Mobile 6 Professional SDK (ARMV4I) {23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release-Static|Windows Mobile 6 Standard SDK (ARMV4I) {23D7679C-764C-4E02-8B29-BB882CEEEFE2}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).Build.0 = Release-Static|Windows Mobile 6 Standard SDK (ARMV4I) + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Win32.ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Win32.ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Smartphone 2003 (ARMV4).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Win32.ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Win32.ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Win32.ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Win32.ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32 + {0C91838B-3372-40B4-A764-DE075A4BC94B}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pjsip-apps/build/pjsip_apps.dsw b/pjsip-apps/build/pjsip_apps.dsw index b9df8c0b..6945bc53 100644 --- a/pjsip-apps/build/pjsip_apps.dsw +++ b/pjsip-apps/build/pjsip_apps.dsw @@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 ############################################################################### +Project: "libg7221codec"="..\..\third_party\build\g7221\libg7221codec.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "libgsmcodec"="..\..\third_party\build\gsm\libgsmcodec.dsp" - Package Owner=<4> Package=<5> @@ -239,6 +251,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name libsrtp End Project Dependency + Begin Project Dependency + Project_Dep_Name libg7221codec + End Project Dependency }}} ############################################################################### @@ -311,6 +326,9 @@ Package=<4> Begin Project Dependency Project_Dep_Name pjmedia_audiodev End Project Dependency + Begin Project Dependency + Project_Dep_Name libg7221codec + End Project Dependency }}} ############################################################################### @@ -411,36 +429,6 @@ Package=<4> ############################################################################### -Project: "test_pjsip"="..\..\pjsip\build\test_pjsip.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name pjlib - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjlib_util - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjmedia - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_core - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_simple - End Project Dependency - Begin Project Dependency - Project_Dep_Name pjsip_ua - End Project Dependency -}}} - -############################################################################### - Global: Package=<5> diff --git a/pjsip-apps/build/python_pjsua.vcproj b/pjsip-apps/build/python_pjsua.vcproj new file mode 100644 index 00000000..66e322a3 --- /dev/null +++ b/pjsip-apps/build/python_pjsua.vcproj @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pjsip-apps/src/py_pjsua/py_pjsua.c b/pjsip-apps/src/py_pjsua/py_pjsua.c index 5e33e8f4..97ea85c8 100644 --- a/pjsip-apps/src/py_pjsua/py_pjsua.c +++ b/pjsip-apps/src/py_pjsua/py_pjsua.c @@ -3766,8 +3766,9 @@ static PyObject *py_pjsua_codec_get_param obj->info->pcm_bits_per_sample = param.info.pcm_bits_per_sample; obj->info->pt = param.info.pt; obj->setting->cng = param.setting.cng; - obj->setting->dec_fmtp_mode = param.setting.dec_fmtp_mode; - obj->setting->enc_fmtp_mode = param.setting.enc_fmtp_mode; + //deprecated: + //obj->setting->dec_fmtp_mode = param.setting.dec_fmtp_mode; + //obj->setting->enc_fmtp_mode = param.setting.enc_fmtp_mode; obj->setting->frm_per_pkt = param.setting.frm_per_pkt; obj->setting->penh = param.setting.penh; obj->setting->plc = param.setting.plc; @@ -3809,8 +3810,9 @@ static PyObject *py_pjsua_codec_set_param param.info.pcm_bits_per_sample = obj->info->pcm_bits_per_sample; param.info.pt = obj->info->pt; param.setting.cng = obj->setting->cng; - param.setting.dec_fmtp_mode = obj->setting->dec_fmtp_mode; - param.setting.enc_fmtp_mode = obj->setting->enc_fmtp_mode; + //Deprecated: + //param.setting.dec_fmtp_mode = obj->setting->dec_fmtp_mode; + //param.setting.enc_fmtp_mode = obj->setting->enc_fmtp_mode; param.setting.frm_per_pkt = obj->setting->frm_per_pkt; param.setting.penh = obj->setting->penh; param.setting.plc = obj->setting->plc; -- cgit v1.2.3