Changeset 103395 in vbox for trunk/src/VBox/Main

Timestamp:

Feb 16, 2024 9:18:42 AM (12 months ago)

Author:

vboxsync

Message:

Main/Audio: Added mutable state dependency checks for audio adapter settings. bugref:10600

Location:

trunk/src/VBox/Main

Files:

• include/AudioSettingsImpl.h (modified) (1 diff)
• src-server/AudioAdapterImpl.cpp (modified) (13 diffs)
• src-server/AudioSettingsImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/include/AudioSettingsImpl.h

@@ -65 +65 @@
     // public methods only for internal purposes
     bool     i_canChangeSettings(void);
+    Machine *i_getMachine(void);
     void     i_onAdapterChanged(IAudioAdapter *pAdapter);
     void     i_onHostDeviceChanged(IHostAudioDevice *pDevice, bool fIsNew, AudioDeviceState_T enmState, IVirtualBoxErrorInfo *pErrInfo);

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

@@ -234 +234 @@
     if (FAILED(autoCaller.hrc())) return autoCaller.hrc();
 
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(m->pParent->i_getMachine());
+    if (FAILED(adep.hrc())) return adep.hrc();
+
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -242 +246 @@
         alock.release();
 
-        m->pParent->i_onSettingsChanged(); // mParent is const, needs no locking
+        m->pParent->i_onSettingsChanged(); // m->pParent is const, needs no locking
         m->pParent->i_onAdapterChanged(this);
     }
@@ -265 +269 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.hrc())) return autoCaller.hrc();
+
+    /* the machine needs to be mutable */
+    AutoMutableOrSavedOrRunningStateDependency adep(m->pParent->i_getMachine());
+    if (FAILED(adep.hrc())) return adep.hrc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -275 +283 @@
         alock.release();
 
-        m->pParent->i_onSettingsChanged(); // mParent is const, needs no locking
+        m->pParent->i_onSettingsChanged(); // m->pParent is const, needs no locking
         m->pParent->i_onAdapterChanged(this);
     }
@@ -298 +306 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.hrc())) return autoCaller.hrc();
+
+    /* the machine needs to be mutable */
+    AutoMutableOrSavedOrRunningStateDependency adep(m->pParent->i_getMachine());
+    if (FAILED(adep.hrc())) return adep.hrc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -308 +320 @@
         alock.release();
 
-        m->pParent->i_onSettingsChanged(); // mParent is const, needs no locking
+        m->pParent->i_onSettingsChanged(); // m->pParent is const, needs no locking
         m->pParent->i_onAdapterChanged(this);
     }
@@ -331 +343 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.hrc())) return autoCaller.hrc();
+
+    /* the machine needs to be mutable */
+    AutoMutableOrSavedStateDependency adep(m->pParent->i_getMachine());
+    if (FAILED(adep.hrc())) return adep.hrc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -345 +361 @@
             alock.release();
 
-            m->pParent->i_onSettingsChanged(); // mParent is const, needs no locking
+            m->pParent->i_onSettingsChanged(); // m->pParent is const, needs no locking
         }
         else
@@ -373 +389 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.hrc())) return autoCaller.hrc();
+
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(m->pParent->i_getMachine());
+    if (FAILED(adep.hrc())) return adep.hrc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -415 +435 @@
             alock.release();
 
-            m->pParent->i_onSettingsChanged(); // mParent is const, needs no locking
+            m->pParent->i_onSettingsChanged(); // m->pParent is const, needs no locking
         }
     }
@@ -438 +458 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.hrc())) return autoCaller.hrc();
+
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(m->pParent->i_getMachine());
+    if (FAILED(adep.hrc())) return adep.hrc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -494 +518 @@
         alock.release();
 
-        m->pParent->i_onSettingsChanged(); // mParent is const, needs no locking
+        m->pParent->i_onSettingsChanged(); // m->pParent is const, needs no locking
     }
 
@@ -539 +563 @@
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.hrc())) return autoCaller.hrc();
+
+    /* the machine needs to be mutable */
+    AutoMutableStateDependency adep(m->pParent->i_getMachine());
+    if (FAILED(adep.hrc())) return adep.hrc();
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);

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

@@ -247 +247 @@
 }
 
+Machine *AudioSettings::i_getMachine(void)
+{
+    return m->pMachine; // m->pMachine is const, needs no locking
+}
+
 /**
  * Gets called when the machine object needs to know that audio adapter settings
@@ -256 +261 @@
 {
     AssertPtrReturnVoid(pAdapter);
-    m->pMachine->i_onAudioAdapterChange(pAdapter); // mParent is const, needs no locking
+    m->pMachine->i_onAudioAdapterChange(pAdapter); // m->pMachine is const, needs no locking
 }
 
@@ -272 +277 @@
 {
     AssertPtrReturnVoid(pDevice);
-    m->pMachine->i_onHostAudioDeviceChange(pDevice, fIsNew, enmState, pErrInfo); // mParent is const, needs no locking
+    m->pMachine->i_onHostAudioDeviceChange(pDevice, fIsNew, enmState, pErrInfo); // m->pMachine is const, needs no locking
 }