Changeset 3744 for pjproject/branches/1.x/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp

Timestamp:

Sep 8, 2011 5:43:54 AM (13 years ago)

Author:

nanang

Message:

Fixed #1365: Applied volume setting (input & output) when the MDA audio device is started.

File:

• pjproject/branches/1.x/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp (modified) (3 diffs)

pjproject/branches/1.x/pjmedia/src/pjmedia-audiodev/symb_mda_dev.cpp

@@ -406 +406 @@
     }
 
+    /* Apply output volume setting if specified */
+    if (parentStrm_->param.flags & 
+        PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING) 
+    {
+        stream_set_cap(&parentStrm_->base,
+                       PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING, 
+                       &parentStrm_->param.input_vol);
+    }
+
     // set stream priority to normal and time sensitive
     iInputStream_->SetPriority(EPriorityNormal, 
@@ -684 +693 @@
                                             iSettings.iChannels);
 
-        // set volume to 1/2th of stream max volume
-        iOutputStream_->SetVolume(iOutputStream_->MaxVolume()/2);
+        /* Apply output volume setting if specified */
+        if (parentStrm_->param.flags & 
+            PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING) 
+        {
+            stream_set_cap(&parentStrm_->base,
+                           PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING, 
+                           &parentStrm_->param.output_vol);
+        } else {
+            // set volume to 1/2th of stream max volume
+            iOutputStream_->SetVolume(iOutputStream_->MaxVolume()/2);
+        }
         
         // set stream priority to normal and time sensitive
@@ -1035 +1053 @@
         break;
     case PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING:
-        if (strm->param.dir & PJMEDIA_DIR_CAPTURE) {
+        if (strm->param.dir & PJMEDIA_DIR_PLAYBACK) {
             PJ_ASSERT_RETURN(strm->out_engine, PJ_EINVAL);