Changeset 56459 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jun 16, 2015 4:24:14 PM (10 years ago)

Author:

vboxsync

Message:

Main: Added audio codec type property, including recommended type.

Location:

trunk/src/VBox/Main/src-server

Files:

• AudioAdapterImpl.cpp (modified) (2 diffs)
• GuestOSTypeImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/AudioAdapterImpl.cpp

@@ -39 +39 @@
     AudioDriverType_T mAudioDriver;
     AudioControllerType_T mAudioController;
+    AudioCodecType_T mAudioCodec;
     settings::StringsMap  properties;
 };
@@ -348 +349 @@
 }
 
+HRESULT AudioAdapter::getAudioCodec(AudioCodecType_T *aAudioCodec)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aAudioCodec = mData->m->mAudioCodec;
+
+    return S_OK;
+}
+
+HRESULT AudioAdapter::setAudioCodec(AudioCodecType_T aAudioCodec)
+{
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(mParent);
+    if (FAILED(adep.rc())) return adep.rc();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    HRESULT rc = S_OK;
+
+    /*
+     * which audio hardware type are we supposed to use?
+     */
+    switch (mData->m->mAudioController)
+    {
+        case AudioControllerType_AC97:
+        {
+            if (   (aAudioCodec != AudioCodecType_STAC9700)
+                && (aAudioCodec != AudioCodecType_AD1980))
+                rc = E_INVALIDARG;
+            break;
+        }
+
+        case AudioControllerType_SB16:
+        {
+            if (aAudioCodec != AudioCodecType_SB16)
+                rc = E_INVALIDARG;
+            break;
+        }
+
+        case AudioControllerType_HDA:
+        {
+            if (aAudioCodec != AudioCodecType_STAC9221)
+                rc = E_INVALIDARG;
+            break;
+        }
+
+        default:
+            AssertMsgFailed (("Wrong audio controller type %d\n",
+                              mData->m->mAudioController));
+            rc = E_FAIL;
+    }
+
+    if (!SUCCEEDED(rc))
+        return setError(rc,
+                        tr ("Invalid audio codec type %d"),
+                        aAudioCodec);
+
+    if (mData->m->mAudioCodec != aAudioCodec)
+    {
+        mData->m.backup();
+        mData->m->mAudioCodec = aAudioCodec;
+        alock.release();
+        AutoWriteLock mlock(mParent COMMA_LOCKVAL_SRC_POS);  // mParent is const, needs no locking
+        mParent->i_setModified(Machine::IsModified_AudioAdapter);
+    }
+
+    return rc;
+}
+
 HRESULT AudioAdapter::getPropertiesList(std::vector<com::Utf8Str>& aProperties)
 {

trunk/src/VBox/Main/src-server/GuestOSTypeImpl.cpp

@@ -38 +38 @@
     , mChipsetType(ChipsetType_PIIX3)
     , mAudioControllerType(AudioControllerType_AC97)
+    , mAudioCodecType(AudioCodecType_STAC9700)
 {
 }
@@ -126 +127 @@
     unconst(mChipsetType)               = ostype.chipsetType;
     unconst(mAudioControllerType)       = ostype.audioControllerType;
+    unconst(mAudioCodecType)            = ostype.audioCodecType;
 
     /* Confirm a successful initialization when it's the case */
@@ -371 +373 @@
 
 
+HRESULT GuestOSType::getRecommendedAudioCodec(AudioCodecType_T *aAudioCodec)
+{
+    *aAudioCodec = mAudioCodecType;
+
+    return S_OK;
+}
+
+
 HRESULT GuestOSType::getRecommendedFloppy(BOOL *aRecommendedFloppy)
 {