Changeset 2461 for pjproject/branches/projects/aps-direct

Timestamp:

Feb 18, 2009 3:23:47 PM (15 years ago)

Author:

nanang

Message:

• Updated audio route API for Symbian APS.

Location:

pjproject/branches/projects/aps-direct

Files:

• pjmedia/include/pjmedia/symbian_sound_aps.h (modified) (1 diff)
• pjmedia/src/pjmedia/symbian_sound_aps.cpp (modified) (1 diff)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (2 diffs)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia/symbian_sound_aps.h

@@ -32 +32 @@
 
 /**
- * Activate/deactivate loudspeaker, when loudspeaker is inactive, audio
- * will be routed to earpiece.
+ * Set audio routing for APS sound device.
  *
  * @param stream        The sound device stream, the stream should be started 
  *                      before calling this function.
- * @param active        Specify PJ_TRUE to activate loudspeaker, and PJ_FALSE
- *                      otherwise.
+ * @param route         Audio routing to be set.
  *
  * @return              PJ_SUCCESS on success.
  */
-PJ_DECL(pj_status_t) pjmedia_snd_aps_activate_loudspeaker(
-                                                pjmedia_snd_stream *stream,
-                                                pj_bool_t active);
+PJ_DECL(pj_status_t) pjmedia_snd_aps_set_route( pjmedia_snd_stream *stream,
+                                                pjmedia_snd_route route);
 
 PJ_END_DECL

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/symbian_sound_aps.cpp

@@ -1399 +1399 @@
  * Activate/deactivate loudspeaker.
  */
-PJ_DEF(pj_status_t) pjmedia_snd_aps_activate_loudspeaker(
-                                        pjmedia_snd_stream *stream,
-                                        pj_bool_t active)
+PJ_DEF(pj_status_t) pjmedia_snd_aps_set_route( pjmedia_snd_stream *stream,
+                                               pjmedia_snd_route route)
 {
     PJ_ASSERT_RETURN(stream && stream->engine, PJ_EINVAL);
+
+    TBool loudspk_active;
     
-    TInt err = stream->engine->ActivateSpeaker(active);
+    switch (route) {
+    case PJMEDIA_SND_ROUTE_DEFAULT:
+    case PJMEDIA_SND_ROUTE_EARPIECE:
+        loudspk_active = EFalse;
+        break;
+    case PJMEDIA_SND_ROUTE_LOUDSPEAKER:
+        loudspk_active = ETrue;
+        break;
+    default:
+        return PJ_EINVAL;
+    }
+    
+    TInt err = stream->engine->ActivateSpeaker(loudspk_active);
     if (err != KErrNone)
         return PJ_RETURN_OS_ERROR(err);

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

@@ -526 +526 @@
     case 't':
         do {
-            static pjmedia_snd_route route = PJMEDIA_SND_ROUTE_LOUDSPEAKER;
-            
-            pjsua_set_snd_route(route);
+            static pjmedia_snd_route route = PJMEDIA_SND_ROUTE_DEFAULT;
             
             if (route == PJMEDIA_SND_ROUTE_LOUDSPEAKER)
@@ -534 +532 @@
             else
                 route = PJMEDIA_SND_ROUTE_LOUDSPEAKER;
-                
+
+            pjsua_set_snd_route(route);
         } while(0);
         break;

pjproject/branches/projects/aps-direct/pjsip/src/pjsua-lib/pjsua_media.c

@@ -2586 +2586 @@
 PJ_DEF(pj_status_t) pjsua_set_snd_route(pjmedia_snd_route route)
 {
+#if defined(PJ_SYMBIAN) || PJ_SYMBIAN==1
+    pjmedia_snd_stream *strm;
+
+    if (!pjsua_var.snd_port)
+        return PJ_ENOTFOUND;
+
+    strm = pjmedia_snd_port_get_snd_stream(pjsua_var.snd_port);
+    return pjmedia_snd_aps_set_route(strm, route);
+#else
     PJ_UNUSED_ARG(route);
-
-    PJ_TODO(IMPLEMENT_SETTING_AUDIO_ROUTE);
     return PJ_ENOTSUP;
+#endif
 }