diff options
| author | Benny Prijono <bennylp@teluu.com> | 2007-05-04 15:12:42 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2007-05-04 15:12:42 +0000 |
| commit | 3728e9884b9206d3af8afa50ef294647e6d29f77 (patch) | |
| tree | 88611a889ab253b249c7762877ae800d2c55f851 | |
| parent | 78340674eec02de120ea17d7d391a2ddddf747d6 (diff) | |
Added null_audio project for Symbian
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@1253 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | build.symbian/bld.inf | 2 | ||||
| -rw-r--r-- | build.symbian/null_audio.mmp | 23 | ||||
| -rw-r--r-- | build.symbian/pjproject.cww | 37 | ||||
| -rw-r--r-- | build.symbian/symbian_ua.mmp | 2 | ||||
| -rw-r--r-- | pjlib/include/pj/config_site_sample.h | 5 |
5 files changed, 43 insertions, 26 deletions
diff --git a/build.symbian/bld.inf b/build.symbian/bld.inf index 02b4b100..5ded5aec 100644 --- a/build.symbian/bld.inf +++ b/build.symbian/bld.inf @@ -9,4 +9,6 @@ pjsip_simple.mmp pjsip_ua.mmp //pjlib_test.mmp //sipstateless.mmp +pjsua_lib.mmp +null_audio.mmp symbian_ua.mmp diff --git a/build.symbian/null_audio.mmp b/build.symbian/null_audio.mmp new file mode 100644 index 00000000..55bc20de --- /dev/null +++ b/build.symbian/null_audio.mmp @@ -0,0 +1,23 @@ +TARGET null_audio.lib +TARGETTYPE lib +UID 0x100039CE 0x10004299 +VENDORID 0x70000001 + +SOURCEPATH ..\pjmedia\src\pjmedia + +OPTION CW -lang c++ + +MACRO PJ_M_I386=1 +MACRO PJ_SYMBIAN=1 + +// +// Platform independent source +// +SOURCE nullsound.c + +SYSTEMINCLUDE ..\pjlib\include +SYSTEMINCLUDE ..\pjmedia\include + +SYSTEMINCLUDE \epoc32\include +SYSTEMINCLUDE \epoc32\include\libc + diff --git a/build.symbian/pjproject.cww b/build.symbian/pjproject.cww index 847bb942..445369f7 100644 --- a/build.symbian/pjproject.cww +++ b/build.symbian/pjproject.cww @@ -239,10 +239,10 @@ <WINDOW>
<SESSION>-1</SESSION>
<EDOCTYPE>0</EDOCTYPE>
- <PATH USERELATIVEPATHS = "true">symbian_ua.mcp</PATH>
+ <PATH USERELATIVEPATHS = "true">null_audio.mcp</PATH>
<FRAMELOC>
- <X>571</X>
- <Y>149</Y>
+ <X>0</X>
+ <Y>0</Y>
</FRAMELOC>
<FRAMESIZE>
<W>347</W>
@@ -263,34 +263,32 @@ </WINDOW>
<WINDOW>
<SESSION>-1</SESSION>
- <EDOCTYPE>1</EDOCTYPE>
- <PATH USERELATIVEPATHS = "true">..\pjsip-apps\src\symbian_ua\ua.cpp</PATH>
- <MAXIMIZED>true</MAXIMIZED>
+ <EDOCTYPE>0</EDOCTYPE>
+ <PATH USERELATIVEPATHS = "true">symbian_ua.mcp</PATH>
<FRAMELOC>
- <X>4</X>
- <Y>4</Y>
+ <X>571</X>
+ <Y>149</Y>
</FRAMELOC>
<FRAMESIZE>
- <W>629</W>
- <H>859</H>
+ <W>347</W>
+ <H>128</H>
</FRAMESIZE>
<DOCKINFO>
- <STATUS>0</STATUS>
- <ROW></ROW>
- <COLUMN></COLUMN>
- <DOCKBARID></DOCKBARID>
- <PCTWIDTH></PCTWIDTH>
- <HGT></HGT>
+ <STATUS>1</STATUS>
+ <ROW>0</ROW>
+ <COLUMN>0</COLUMN>
+ <DOCKBARID>59420</DOCKBARID>
+ <PCTWIDTH>1.000000</PCTWIDTH>
+ <HGT>294</HGT>
<GROUPID>
- <GIDHIGHPART></GIDHIGHPART>
- <GIDLOWPART></GIDLOWPART>
+ <GIDHIGHPART>4294967294</GIDHIGHPART>
+ <GIDLOWPART>4294967294</GIDLOWPART>
</GROUPID>
</DOCKINFO>
</WINDOW>
<WINDOW>
<SESSION>-2147483648</SESSION>
<EDOCTYPE>36</EDOCTYPE>
- <DEFAULT>true</DEFAULT>
<FRAMELOC>
<X>4</X>
<Y>23</Y>
@@ -315,7 +313,6 @@ <WINDOW>
<SESSION>-2147483648</SESSION>
<EDOCTYPE>20</EDOCTYPE>
- <DEFAULT>true</DEFAULT>
<FRAMELOC>
<X>4</X>
<Y>23</Y>
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp index 0c53eda1..46075da9 100644 --- a/build.symbian/symbian_ua.mmp +++ b/build.symbian/symbian_ua.mmp @@ -25,6 +25,6 @@ SYSTEMINCLUDE \epoc32\include SYSTEMINCLUDE \epoc32\include\libc
LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib eexe.lib
-STATICLIBRARY pjsua_lib.lib pjsip_ua.lib pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib pjnath.lib pjlib_util.lib pjlib.lib ecrt0.lib
+STATICLIBRARY null_audio.lib pjsua_lib.lib pjsip_ua.lib pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib pjnath.lib pjlib_util.lib pjlib.lib ecrt0.lib
CAPABILITY None
diff --git a/pjlib/include/pj/config_site_sample.h b/pjlib/include/pj/config_site_sample.h index 41ce6725..1ac1735f 100644 --- a/pjlib/include/pj/config_site_sample.h +++ b/pjlib/include/pj/config_site_sample.h @@ -92,9 +92,6 @@ # define PJSIP_MAX_DIALOG_COUNT 15 # define PJSIP_UDP_SO_SNDBUF_SIZE 4000 # define PJSIP_UDP_SO_RCVBUF_SIZE 4000 -# define PJSIP_AUTH_HEADER_CACHING 0 -# define PJSIP_AUTH_AUTO_SEND_NEXT 0 -# define PJSIP_AUTH_QOP_SUPPORT 0 # define PJMEDIA_HAS_LARGE_FILTER 0 # define PJMEDIA_HAS_SMALL_FILTER 0 @@ -121,8 +118,6 @@ # endif # define PJSUA_MAX_CALLS 512 -# define PJSIP_AUTH_HEADER_CACHING 1 -# define PJSIP_AUTH_AUTO_SEND_NEXT 1 #endif |