Ticket #577: Initial source of sound device wrapper with APS

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2174 74dad513-b988-da41-8d7b-12977e46ad98

4 files changed, 85 insertions, 44 deletions

diff --git a/build.symbian/bld.inf b/build.symbian/bld.inf
index 80645f64..b624905e 100644
--- a/build.symbian/bld.inf
+++ b/build.symbian/bld.inf
@@ -1,3 +1,6 @@
+#define SND_USE_NULL	0
+#define SND_USE_APS	0
+
 prj_platforms
 winscw
 //armv5
@@ -10,8 +13,6 @@ pjlib.mmp
 pjlib_util.mmp
 pjnath.mmp
 pjsdp.mmp
-//null_audio.mmp
-symbian_audio.mmp
 pjmedia.mmp
 pjsip.mmp
 pjsip_simple.mmp
@@ -23,6 +24,15 @@ libsrtp.mmp
 libgsmcodec.mmp
 libspeexcodec.mmp
 
+/* Sound device impl */
+#if SND_USE_NULL
+	null_audio.mmp
+#elif SND_USE_APS
+	symbian_audio_aps.mmp
+#else
+	symbian_audio.mmp
+#endif
+
 /* Applications */
 //pjlib_test.mmp
 //symsndtest.mmp
diff --git a/build.symbian/symbian_audio_aps.mmp b/build.symbian/symbian_audio_aps.mmp
new file mode 100644
index 00000000..85cb1e84
--- /dev/null
+++ b/build.symbian/symbian_audio_aps.mmp
@@ -0,0 +1,20 @@
+TARGET 					symbian_audio_aps.lib
+TARGETTYPE 				lib
+
+OPTION                                  CW -lang c++ 
+OPTION                                  GCCE -O2 -fno-unit-at-a-time 
+
+MACRO                                   PJ_M_I386=1
+MACRO					PJ_SYMBIAN=1 
+
+SYSTEMINCLUDE                           ..\pjmedia\include 
+SYSTEMINCLUDE                           ..\pjlib\include 
+
+SOURCEPATH                              ..\pjmedia\src\pjmedia 
+SOURCE                                  symbian_sound_aps.cpp 
+
+SYSTEMINCLUDE                           \epoc32\include\mmf\server 
+SYSTEMINCLUDE                           \epoc32\include\mmf\common 
+SYSTEMINCLUDE                           \epoc32\include\mda\common 
+SYSTEMINCLUDE                           \epoc32\include\libc 
+SYSTEMINCLUDE                           \epoc32\include 
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp
index e23d0d86..5bdfebad 100644
--- a/build.symbian/symbian_ua.mmp
+++ b/build.symbian/symbian_ua.mmp
@@ -1,3 +1,6 @@
+#define SND_USE_NULL	0

+#define SND_USE_APS	0

+

 TARGET 		symbian_ua.exe

 TARGETTYPE 	exe

 UID		0x0 0xA000000D

@@ -7,10 +10,6 @@ SOURCEPATH	..\pjsip-apps\src\symbian_ua
 MACRO		PJ_M_I386=1

 MACRO		PJ_SYMBIAN=1

 

-#if defined(PJ_BUILD_DLL)

-	MACRO		PJ_DLL=1

-#endif

-

 // Source files

 

 SOURCE	ua.cpp

@@ -18,6 +17,10 @@ SOURCE	main_symbian.cpp
 

 DOCUMENT ua.h

 

+START RESOURCE  symbian_ua_reg.rss

+	TARGETPATH      \private\10003a3f\apps

+END

+

 SYSTEMINCLUDE	..\pjlib\include

 SYSTEMINCLUDE	..\pjlib-util\include

 SYSTEMINCLUDE	..\pjnath\include

@@ -27,18 +30,25 @@ SYSTEMINCLUDE	..\pjsip\include
 SYSTEMINCLUDE	\epoc32\include

 SYSTEMINCLUDE	\epoc32\include\libc

 

-#if defined(PJ_BUILD_DLL)

-	LIBRARY		pjsua_lib.lib pjsip_ua.lib

-	LIBRARY		pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib

-	LIBRARY		pjnath.lib pjlib_util.lib pjlib.lib

-	LIBRARY		symbian_audio.lib libsrtp.lib

-	LIBRARY		libgsmcodec.lib libspeexcodec.lib

+STATICLIBRARY	pjsua_lib.lib pjsip_ua.lib

+STATICLIBRARY	pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib

+STATICLIBRARY	pjnath.lib pjlib_util.lib pjlib.lib

+STATICLIBRARY	libsrtp.lib

+STATICLIBRARY	libgsmcodec.lib libspeexcodec.lib

+

+#if SND_USE_NULL || defined(WINSCW)

+    STATICLIBRARY	null_audio.lib

+    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 

+#elif SND_USE_APS

+    STATICLIBRARY	symbian_audio_aps.lib

+    LIBRARY		APSSession2.lib

+    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD

+    MACRO		PJMEDIA_SYM_SND_USE_APS=1

 #else

-	STATICLIBRARY	pjsua_lib.lib pjsip_ua.lib

-	STATICLIBRARY	pjsip_simple.lib pjsip.lib pjsdp.lib pjmedia.lib

-	STATICLIBRARY	pjnath.lib pjlib_util.lib pjlib.lib

-	STATICLIBRARY	symbian_audio.lib libsrtp.lib

-	STATICLIBRARY	libgsmcodec.lib libspeexcodec.lib

+    STATICLIBRARY	symbian_audio.lib

+    LIBRARY 		mediaclientaudiostream.lib

+    LIBRARY 		mediaclientaudioinputstream.lib

+    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 

 #endif

 

 #ifdef WINSCW

@@ -46,14 +56,6 @@ SYSTEMINCLUDE	\epoc32\include\libc
 #endif

 

 LIBRARY		esock.lib insock.lib charconv.lib euser.lib estlib.lib 

-LIBRARY 	mediaclientaudiostream.lib

-LIBRARY 	mediaclientaudioinputstream.lib

-

-CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 

-

-START RESOURCE  symbian_ua_reg.rss

-	TARGETPATH      \private\10003a3f\apps

-END

 

 // The default 8KB seems to be insufficient with all bells and

 // whistles turned on

diff --git a/build.symbian/symsndtest.mmp b/build.symbian/symsndtest.mmp
index daea7005..ed42770e 100644
--- a/build.symbian/symsndtest.mmp
+++ b/build.symbian/symsndtest.mmp
@@ -1,3 +1,6 @@
+#define SND_USE_NULL	0
+#define SND_USE_APS	0
+
 TARGET 		symsndtest.exe
 TARGETTYPE 	exe
 UID		0x0 0xA000000E
@@ -7,15 +10,15 @@ SOURCEPATH	..\pjsip-apps\src\symsndtest
 MACRO		PJ_M_I386=1
 MACRO		PJ_SYMBIAN=1
 
-#if defined(PJ_BUILD_DLL)
-	MACRO		PJ_DLL=1
-#endif
-
 // Test files
 
 SOURCE	app_main.cpp
 SOURCE	main_symbian.cpp
 
+START RESOURCE  symsndtest_reg.rss
+	TARGETPATH	\private\10003a3f\apps
+END
+
 SYSTEMINCLUDE	..\pjlib\include
 SYSTEMINCLUDE	..\pjmedia\include
 
@@ -23,24 +26,30 @@ SYSTEMINCLUDE	\epoc32\include
 SYSTEMINCLUDE	\epoc32\include\libc
 
 LIBRARY		charconv.lib euser.lib estlib.lib
-
-#if defined(PJ_BUILD_DLL)
-	LIBRARY		symbian_audio.lib pjlib.lib 
+LIBRARY		esock.lib insock.lib
+STATICLIBRARY	pjlib.lib pjmedia.lib
+
+#if SND_USE_NULL || defined(WINSCW)
+    STATICLIBRARY	null_audio.lib
+    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
+#elif SND_USE_APS
+    SOURCEPATH                              ..\pjmedia\src\pjmedia 
+    SOURCE                                  symbian_sound_aps.cpp 
+
+    SYSTEMINCLUDE                           \epoc32\include\mmf\server 
+    SYSTEMINCLUDE                           \epoc32\include\mmf\common 
+    SYSTEMINCLUDE                           \epoc32\include\mda\common 
+
+    //STATICLIBRARY	symbian_audio_aps.lib
+    LIBRARY		APSSession2.lib
+    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment MultimediaDD
 #else
-	STATICLIBRARY	symbian_audio.lib pjlib.lib 
+    STATICLIBRARY	symbian_audio.lib
+    LIBRARY 		mediaclientaudiostream.lib
+    LIBRARY 		mediaclientaudioinputstream.lib
+    CAPABILITY		NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
 #endif
 
-LIBRARY		esock.lib insock.lib
-LIBRARY 	mediaclientaudiostream.lib
-LIBRARY 	mediaclientaudioinputstream.lib
-
 #ifdef WINSCW
 	STATICLIBRARY   eexe.lib ecrt0.lib
 #endif
-
-CAPABILITY	NetworkServices LocalServices ReadUserData WriteUserData UserEnvironment 
-
-START RESOURCE  symsndtest_reg.rss
-	TARGETPATH	\private\10003a3f\apps
-END
-