Changeset 2500

Timestamp:

Mar 10, 2009 3:03:04 PM (14 years ago)

Author:

nanang

Message:

• 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

Location:

pjproject/branches/projects/aps-direct

Files:

• build.symbian/pjmedia_audiodev.mmp (modified) (1 diff)
• build.symbian/symbian_ua.mmp (modified) (1 diff)
• build.symbian/symbian_ua.pkg (added)
• build.symbian/symbian_ua_udeb.pkg (modified) (2 diffs)
• build.symbian/symbian_ua_urel.pkg (modified) (2 diffs)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (2 diffs)

pjproject/branches/projects/aps-direct/build.symbian/pjmedia_audiodev.mmp

@@ -7 +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

pjproject/branches/projects/aps-direct/build.symbian/symbian_ua.mmp

@@ -11 +11 @@
 MACRO                   PJ_M_I386=1
 MACRO                   PJ_SYMBIAN=1
-
-OPTION                  GCCE -O2 -fno-unit-at-a-time
-SRCDBG
 
 // Source files

pjproject/branches/projects/aps-direct/build.symbian/symbian_ua_udeb.pkg

@@ -1 @@
-; 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
@@ -5 +8 @@
 
 ; Header
-#{"symbian_ua"},(0xA000000D), 0, 1, 1
+#{"symbian_ua"},(0x200235D3), 0, 1, 1
 
 ; Platform compatibility

pjproject/branches/projects/aps-direct/build.symbian/symbian_ua_urel.pkg

@@ -1 +1 @@
 ; 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
@@ -5 +8 @@
 
 ; Header
-#{"symbian_ua"},(0xA000000D), 0, 1, 1
+#{"symbian_ua"},(0x200235D3), 0, 1, 1
 
 ; Platform compatibility

pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/ua.cpp

@@ -498 +498 @@
             "  j    Toggle loopback audio\n"
 #endif
+            "up/dn  Increase/decrease output volume\n"
             "  s    Subscribe " SIP_DST_URI "\n"
             "  S    Unsubscribe presence\n"
@@ -532 +533 @@
 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':