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

Timestamp:

Nov 7, 2018 5:13:56 PM (6 years ago)

Author:

vboxsync

Message:

Recording: More bugfixes for Main and FE/Qt.

File:

• trunk/src/VBox/Main/src-server/CaptureScreenSettingsImpl.cpp (modified) (18 diffs)

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

@@ -292 +292 @@
 HRESULT CaptureScreenSettings::setFeatures(ULONG aFeatures)
 {
-    if (!i_canChangeSettings())
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change features while capturing is enabled"));
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     m->bd.backup();
@@ -325 +325 @@
 HRESULT CaptureScreenSettings::setDestination(CaptureDestination_T aDestination)
 {
-    if (!i_canChangeSettings())
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change destination type while capturing is enabled"));
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     m->bd.backup();
     m->bd->enmDest = aDestination;
@@ -353 +353 @@
 HRESULT CaptureScreenSettings::setFileName(const com::Utf8Str &aFileName)
 {
-    if (!i_canChangeSettings())
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change file name while capturing is enabled"));
-
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     Utf8Str strFile(aFileName);
@@ -388 +388 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change maximum time while capturing is enabled"));
 
@@ -414 +414 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change maximum file size while capturing is enabled"));
 
@@ -440 +440 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
-        return setError(E_INVALIDARG, tr("Cannot change options string while capturing is enabled"));
+    if (m->bd->fEnabled)
+        return setError(E_INVALIDARG, tr("Cannot change options while capturing is enabled"));
 
     m->bd.backup();
     m->bd->strOptions = aOptions;
 
-    AutoWriteLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);
-    m->pMachine->i_setModified(Machine::IsModified_Capture);
-    mlock.release();
+    alock.release();
+    AutoWriteLock mlock(m->pMachine COMMA_LOCKVAL_SRC_POS);
+    m->pMachine->i_setModified(Machine::IsModified_Capture);
 
     return S_OK;
@@ -466 +466 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change audio codec while capturing is enabled"));
 
@@ -492 +492 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change audio Hertz rate while capturing is enabled"));
 
@@ -518 +518 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change audio bits while capturing is enabled"));
 
@@ -544 +544 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change audio channels while capturing is enabled"));
 
@@ -570 +570 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change video codec while capturing is enabled"));
 
@@ -596 +596 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change video width while capturing is enabled"));
 
@@ -622 +622 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change video height while capturing is enabled"));
 
@@ -648 +648 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change video rate while capturing is enabled"));
 
@@ -674 +674 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change video rate control mode while capturing is enabled"));
 
@@ -696 +696 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change video FPS while capturing is enabled"));
 
@@ -722 +722 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    if (!i_canChangeSettings())
+    if (m->bd->fEnabled)
         return setError(E_INVALIDARG, tr("Cannot change video rate scaling method while capturing is enabled"));
 
@@ -729 +729 @@
 
     return E_NOTIMPL;
-}
-
-bool CaptureScreenSettings::i_canChangeSettings(void)
-{
-    AutoAnyStateDependency adep(m->pMachine);
-    AssertComRCReturn(adep.rc(), false);
-
-    if (   Global::IsOnline(adep.machineState())
-        && m->bd->fEnabled)
-        return false;
-
-    return true;
 }