Changeset 75417 in vbox

Timestamp:

Nov 13, 2018 12:07:20 PM (6 years ago)

Author:

vboxsync

Message:

Recording/Main: Simplified code a bit; use the stream settings file name instead of having another file name defined.

Location:

trunk/src/VBox/Main

Files:

• include/RecordingStream.h (modified) (1 diff)
• src-client/RecordingStream.cpp (modified) (4 diffs)

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

@@ -174 +174 @@
         /** File handle to use for writing. */
         RTFILE              hFile;
-        /** File name being used for this stream. */
-        Utf8Str             strName;
         /** Pointer to WebM writer instance being used. */
         WebMWriter         *pWEBM;

trunk/src/VBox/Main/src-client/RecordingStream.cpp

@@ -155 +155 @@
                 if (RT_SUCCESS(rc))
                 {
-                    this->File.hFile   = hFile;
-                    this->File.strName = pszFile;
+                    this->File.hFile = hFile;
+                    this->ScreenSettings.File.strName = pszFile;
                 }
             }
@@ -697 +697 @@
 int RecordingStream::initInternal(RecordingContext *a_pCtx, uint32_t uScreen, const settings::RecordingScreenSettings &Settings)
 {
+    this->pCtx           = a_pCtx;
+    this->uScreenID      = uScreen;
+    this->ScreenSettings = Settings;
+
     int rc = parseOptionsString(Settings.strOptions);
     if (RT_FAILURE(rc))
@@ -730 +734 @@
         case RecordingDestination_File:
         {
+            Assert(this->ScreenSettings.File.strName.isNotEmpty());
             const char *pszFile = this->ScreenSettings.File.strName.c_str();
 
@@ -811 +816 @@
     if (RT_SUCCESS(rc))
     {
-        this->pCtx           = a_pCtx;
-        this->enmState       = RECORDINGSTREAMSTATE_INITIALIZED;
-        this->fEnabled       = true;
-        this->uScreenID      = uScreen;
-        this->tsStartMs      = RTTimeMilliTS();
-        this->ScreenSettings = Settings;
+        this->enmState  = RECORDINGSTREAMSTATE_INITIALIZED;
+        this->fEnabled  = true;
+        this->tsStartMs = RTTimeMilliTS();
     }
     else