Changeset 75324 in vbox for trunk/src/VBox/Main/include

Timestamp:

Nov 8, 2018 3:39:50 PM (6 years ago)

Author:

vboxsync

Message:

Recording: More settings bugfixes for Main and FE/Qt.

Location:

trunk/src/VBox/Main/include

Files:

• CaptureScreenSettingsImpl.h (modified) (3 diffs)
• CaptureSettingsImpl.h (modified) (2 diffs)
• MachineImpl.h (modified) (1 diff)

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

@@ -23 +23 @@
 #include "CaptureScreenSettingsWrap.h"
 
+class CaptureSettings;
+
 namespace settings
 {
@@ -39 +41 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(Machine *aParent, uint32_t uScreenId, const settings::CaptureScreenSettings& data);
-    HRESULT init(Machine *aParent, CaptureScreenSettings *that);
-    HRESULT initCopy(Machine *aParent, CaptureScreenSettings *that);
+    HRESULT init(CaptureSettings *aParent, uint32_t uScreenId, const settings::CaptureScreenSettings& data);
+    HRESULT init(CaptureSettings *aParent, CaptureScreenSettings *that);
+    HRESULT initCopy(CaptureSettings *aParent, CaptureScreenSettings *that);
     void uninit();
 
@@ -102 +104 @@
 
     // internal methods
-    int  i_getDefaultFileName(Utf8Str &strFile);
     int  i_initInternal();
 

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

@@ -56 +56 @@
     void i_applyDefaults(void);
 
+    int i_getDefaultFileName(Utf8Str &strFile);
+    bool i_canChangeSettings(void);
+    void i_onSettingsChanged(void);
+
 private:
 
-    int i_addScreen(uint32_t uScreenId, const settings::CaptureScreenSettings &data);
+    /** Map of screen settings objects. The key specifies the screen ID. */
+    typedef std::map <uint32_t, ComObjPtr<CaptureScreenSettings> > CaptureScreenSettingsMap;
+
+    void i_reset(void);
+    int i_syncToMachineDisplays(void);
+    int i_createScreenObj(CaptureScreenSettingsMap &screenSettingsMap, uint32_t uScreenId, const settings::CaptureScreenSettings &data);
+    int i_destroyScreenObj(CaptureScreenSettingsMap &screenSettingsMap, uint32_t uScreenId);
+    int i_destroyAllScreenObj(CaptureScreenSettingsMap &screenSettingsMap);
 
 private:
@@ -72 +83 @@
 private:
 
-    /** Map of screen settings objects. The key specifies the screen ID. */
-    typedef std::map <uint32_t, ComObjPtr<CaptureScreenSettings> > CaptureScreenSettingsMap;
-
     struct Data;
     Data *m;

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

@@ -489 +489 @@
     Utf8Str i_getOSTypeId() const { return mUserData->s.strOsType; }
     ChipsetType_T i_getChipsetType() const { return mHWData->mChipsetType; }
+    ULONG i_getMonitorCount() const { return mHWData->mMonitorCount; }
     ParavirtProvider_T i_getParavirtProvider() const { return mHWData->mParavirtProvider; }
     Utf8Str i_getParavirtDebug() const { return mHWData->mParavirtDebug; }