- Added feature to increase/decrease output volume in symbian_ua
- Removed optimization setting in some MMP files
- Added new symbian_ua.pkg in Carbide development for comfortness
git-svn-id: https://svn.pjsip.org/repos/pjproject/branches/projects/aps-direct@2500 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/build.symbian/pjmedia_audiodev.mmp b/build.symbian/pjmedia_audiodev.mmp
index 3bed275..ccabc2f 100644
--- a/build.symbian/pjmedia_audiodev.mmp
+++ b/build.symbian/pjmedia_audiodev.mmp
@@ -6,7 +6,7 @@
//
// GCCE optimization setting
//
-OPTION GCCE -O2 -fno-unit-at-a-time
+//OPTION GCCE -O2 -fno-unit-at-a-time
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
diff --git a/build.symbian/symbian_ua.mmp b/build.symbian/symbian_ua.mmp
index f2b832d..9521476 100644
--- a/build.symbian/symbian_ua.mmp
+++ b/build.symbian/symbian_ua.mmp
@@ -11,9 +11,6 @@
MACRO PJ_M_I386=1
MACRO PJ_SYMBIAN=1
-OPTION GCCE -O2 -fno-unit-at-a-time
-SRCDBG
-
// Source files
SOURCE ua.cpp
diff --git a/build.symbian/symbian_ua.pkg b/build.symbian/symbian_ua.pkg
new file mode 100644
index 0000000..c60a62b
--- /dev/null
+++ b/build.symbian/symbian_ua.pkg
@@ -0,0 +1,18 @@
+; symbian_ua.pkg
+
+; Languages
+&EN
+
+; Header
+#{"symbian_ua"},(0x200235D3), 0, 1, 1
+
+; Platform compatibility
+[0x101F7961], *, *, *,{"Series60ProductID"}
+
+; vendor
+%{"PJSIP"}
+:"PJSIP"
+
+; Target
+"$(EPOCROOT)Epoc32\release\$(PLATFORM)\$(TARGET)\symbian_ua.exe"-"!:\sys\bin\symbian_ua.exe"
+"$(EPOCROOT)Epoc32\data\z\private\10003a3f\apps\symbian_ua_reg.rSC"-"!:\private\10003a3f\import\apps\symbian_ua_reg.rSC"
diff --git a/build.symbian/symbian_ua_udeb.pkg b/build.symbian/symbian_ua_udeb.pkg
index 99af75d..5c255bf 100644
--- a/build.symbian/symbian_ua_udeb.pkg
+++ b/build.symbian/symbian_ua_udeb.pkg
@@ -1,10 +1,13 @@
-; symbian_ua.pkg
+; symbian_ua_udeb.pkg
+
+; for Carbide development, please use symbian_ua.pkg for comfortness
+; (epoc32 path, platform, and target are set automatically using env vars)
; Languages
&EN
; Header
-#{"symbian_ua"},(0xA000000D), 0, 1, 1
+#{"symbian_ua"},(0x200235D3), 0, 1, 1
; Platform compatibility
[0x101F7961], *, *, *,{"Series60ProductID"}
diff --git a/build.symbian/symbian_ua_urel.pkg b/build.symbian/symbian_ua_urel.pkg
index 731276d..3bd6098 100644
--- a/build.symbian/symbian_ua_urel.pkg
+++ b/build.symbian/symbian_ua_urel.pkg
@@ -1,10 +1,13 @@
; symbian_ua.pkg
+; for Carbide development, please use symbian_ua.pkg for comfortness
+; (epoc32 path, platform, and target are set automatically using env vars)
+
; Languages
&EN
; Header
-#{"symbian_ua"},(0xA000000D), 0, 1, 1
+#{"symbian_ua"},(0x200235D3), 0, 1, 1
; Platform compatibility
[0x101F7961], *, *, *,{"Series60ProductID"}
diff --git a/pjsip-apps/src/symbian_ua/ua.cpp b/pjsip-apps/src/symbian_ua/ua.cpp
index 2a32cdb..b34e7fa 100644
--- a/pjsip-apps/src/symbian_ua/ua.cpp
+++ b/pjsip-apps/src/symbian_ua/ua.cpp
@@ -497,6 +497,7 @@
#if !defined(PJMEDIA_CONF_USE_SWITCH_BOARD) || PJMEDIA_CONF_USE_SWITCH_BOARD==0
" j Toggle loopback audio\n"
#endif
+ "up/dn Increase/decrease output volume\n"
" s Subscribe " SIP_DST_URI "\n"
" S Unsubscribe presence\n"
" o Set account online\n"
@@ -532,6 +533,32 @@
static void HandleMainMenu(TKeyCode kc) {
switch (kc) {
+ case EKeyUpArrow:
+ case EKeyDownArrow:
+ {
+ unsigned vol;
+ pj_status_t status;
+
+ status = pjsua_snd_get_setting(
+ PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING, &vol);
+ if (status == PJ_SUCCESS) {
+ if (kc == EKeyUpArrow)
+ vol = PJ_MIN(100, vol+10);
+ else
+ vol = (vol>=10 ? vol-10 : 0);
+ status = pjsua_snd_set_setting(
+ PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING,
+ &vol, PJ_TRUE);
+ }
+
+ if (status == PJ_SUCCESS) {
+ PJ_LOG(3,(THIS_FILE, "Output volume set to %d", vol));
+ } else {
+ pjsua_perror(THIS_FILE, "Error setting volume", status);
+ }
+ }
+ break;
+
case 't':
{
pjmedia_aud_dev_route route;