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

Timestamp:

Nov 15, 2018 4:12:07 PM (6 years ago)

Author:

vboxsync

Message:

Recording/Main: Implemented better support for recording limits (also now configurable per screen).

Location:

trunk/src/VBox/Main/src-server

Files:

• MachineImpl.cpp (modified) (2 diffs)
• RecordingSettingsImpl.cpp (modified) (6 diffs)

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

@@ -14102 +14102 @@
  * @note Locks this object for reading.
  */
-HRESULT SessionMachine::i_onRecordingChange()
+HRESULT SessionMachine::i_onRecordingChange(BOOL aEnable)
 {
     LogFlowThisFunc(("\n"));
@@ -14120 +14120 @@
         return S_OK;
 
-    return directControl->OnRecordingChange();
+    return directControl->OnRecordingChange(aEnable);
 }
 

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

@@ -46 +46 @@
     ComObjPtr<RecordingSettings> pPeer;
     RecordScreenSettingsMap      mapScreenObj;
-    bool                         fHasMachineLock;
 
     // use the XML settings structure in the members for simplicity
@@ -87 +86 @@
 
     m->bd.allocate();
-    m->fHasMachineLock = false;
 
     autoInitSpan.setSucceeded();
@@ -123 +121 @@
     m->bd.share(that->m->bd);
     m->mapScreenObj = that->m->mapScreenObj;
-    m->fHasMachineLock = false;
 
     autoInitSpan.setSucceeded();
@@ -156 +153 @@
     m->bd.attachCopy(that->m->bd);
     m->mapScreenObj = that->m->mapScreenObj;
-    m->fHasMachineLock = false;
 
     autoInitSpan.setSucceeded();
@@ -219 +215 @@
 
         alock.release();
-        rc = m->pMachine->i_onRecordingChange();
+        rc = m->pMachine->i_onRecordingChange(enable);
         if (FAILED(rc))
         {
@@ -236 +232 @@
             m->pMachine->i_setModified(Machine::IsModified_Recording);
 
-            /* We need to indicate here that we just took the machine lock, as Machine::i_saveSettings() will
-             * call i_commit(), which in turn also wants to lock the machine for writing. */
-            m->fHasMachineLock = true;
-
             /** Save settings if online - @todo why is this required? -- @bugref{6818} */
             if (Global::IsOnline(m->pMachine->i_getMachineState()))
                 rc = m->pMachine->i_saveSettings(NULL);
-
-            m->fHasMachineLock = false;
         }
     }