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

Timestamp:

Nov 7, 2018 1:56:14 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

126417

Message:

Recording: Bugfixes for Main and FE/Qt.

Location:

trunk/src/VBox/Main/include

Files:

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

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

@@ -103 +103 @@
     // internal methods
     bool i_canChangeSettings();
-    int  i_getDefaultCaptureFile(Utf8Str &strFile);
+    int  i_getDefaultFileName(Utf8Str &strFile);
+    int  i_initInternal();
 
 private:

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

@@ -26 +26 @@
 {
     struct CaptureSettings;
+    struct CaptureScreenSettings;
 }
 
@@ -57 +58 @@
 private:
 
+    int i_addScreen(uint32_t uScreenId, const settings::CaptureScreenSettings &data);
+
+private:
+
     // wrapped ICaptureSettings properties
     HRESULT getEnabled(BOOL *enabled);

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

@@ -494 +494 @@
     void i_setModified(uint32_t fl, bool fAllowStateModification = true);
     void i_setModifiedLock(uint32_t fl, bool fAllowStateModification = true);
+
+    MachineState_T i_getMachineState() const { return mData->mMachineState; }
 
     bool i_isStateModificationAllowed() const { return mData->m_fAllowStateModification; }

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

@@ -180 +180 @@
     int Destroy(void);
 
+    int Start(void);
+    int Stop(void);
+
     int SendAudioFrame(const void *pvData, size_t cbData, uint64_t uTimestampMs);
     int SendVideoFrame(uint32_t uScreen,
@@ -196 +199 @@
 
     int createInternal(const settings::CaptureSettings &a_Settings);
+    int startInternal(void);
+    int stopInternal(void);
 
     int destroyInternal(void);

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

@@ -130 +130 @@
 protected:
 
-    int open(void);
+    int open(const settings::CaptureScreenSettings &Settings);
     int close(void);