Changeset 82423 in vbox for trunk/src/VBox

Timestamp:

Dec 5, 2019 4:09:59 PM (5 years ago)

Author:

vboxsync

Message:

Main/Recording: Cleanup; greatly reduced the include maze [build fix].

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -21 +21 @@
 # pragma once
 #endif
-
-using namespace com;
 
 #include <VBox/err.h>

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

@@ -56 +56 @@
 //# define VBOX_RECORDING_DUMP
 #endif
-
-#ifdef VBOX_RECORDING_DUMP
-#pragma pack(push)
-#pragma pack(1)
-typedef struct
-{
-    uint16_t u16Magic;
-    uint32_t u32Size;
-    uint16_t u16Reserved1;
-    uint16_t u16Reserved2;
-    uint32_t u32OffBits;
-} RECORDINGBMPHDR, *PRECORDINGBMPHDR;
-AssertCompileSize(RECORDINGBMPHDR, 14);
-
-typedef struct
-{
-    uint32_t u32Size;
-    uint32_t u32Width;
-    uint32_t u32Height;
-    uint16_t u16Planes;
-    uint16_t u16BitCount;
-    uint32_t u32Compression;
-    uint32_t u32SizeImage;
-    uint32_t u32XPelsPerMeter;
-    uint32_t u32YPelsPerMeter;
-    uint32_t u32ClrUsed;
-    uint32_t u32ClrImportant;
-} RECORDINGBMPDIBHDR, *PRECORDINGBMPDIBHDR;
-AssertCompileSize(RECORDINGBMPDIBHDR, 40);
-
-#pragma pack(pop)
-#endif /* VBOX_RECORDING_DUMP */
 
 

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

@@ -27 +27 @@
 #include "RecordingUtils.h"
 #include "WebMWriter.h"
-
 
 #ifdef VBOX_RECORDING_DUMP
@@ -214 +213 @@
     while ((pos = strOptions.parseKeyValue(key, value, pos)) != com::Utf8Str::npos)
     {
-        if (key.compare("vc_quality", Utf8Str::CaseInsensitive) == 0)
+        if (key.compare("vc_quality", com::Utf8Str::CaseInsensitive) == 0)
         {
 #ifdef VBOX_WITH_LIBVPX
             Assert(this->ScreenSettings.Video.ulFPS);
-            if (value.compare("realtime", Utf8Str::CaseInsensitive) == 0)
+            if (value.compare("realtime", com::Utf8Str::CaseInsensitive) == 0)
                 this->Video.Codec.VPX.uEncoderDeadline = VPX_DL_REALTIME;
-            else if (value.compare("good", Utf8Str::CaseInsensitive) == 0)
+            else if (value.compare("good", com::Utf8Str::CaseInsensitive) == 0)
                 this->Video.Codec.VPX.uEncoderDeadline = 1000000 / this->ScreenSettings.Video.ulFPS;
-            else if (value.compare("best", Utf8Str::CaseInsensitive) == 0)
+            else if (value.compare("best", com::Utf8Str::CaseInsensitive) == 0)
                 this->Video.Codec.VPX.uEncoderDeadline = VPX_DL_BEST_QUALITY;
             else
@@ -230 +229 @@
             }
         }
-        else if (key.compare("vc_enabled", Utf8Str::CaseInsensitive) == 0)
-        {
-            if (value.compare("false", Utf8Str::CaseInsensitive) == 0)
+        else if (key.compare("vc_enabled", com::Utf8Str::CaseInsensitive) == 0)
+        {
+            if (value.compare("false", com::Utf8Str::CaseInsensitive) == 0)
                 this->ScreenSettings.featureMap[RecordingFeature_Video] = false;
         }
-        else if (key.compare("ac_enabled", Utf8Str::CaseInsensitive) == 0)
+        else if (key.compare("ac_enabled", com::Utf8Str::CaseInsensitive) == 0)
         {
 #ifdef VBOX_WITH_AUDIO_RECORDING
-            if (value.compare("true", Utf8Str::CaseInsensitive) == 0)
+            if (value.compare("true", com::Utf8Str::CaseInsensitive) == 0)
                 this->ScreenSettings.featureMap[RecordingFeature_Audio] = true;
 #endif
         }
-        else if (key.compare("ac_profile", Utf8Str::CaseInsensitive) == 0)
+        else if (key.compare("ac_profile", com::Utf8Str::CaseInsensitive) == 0)
         {
 #ifdef VBOX_WITH_AUDIO_RECORDING
-            if (value.compare("low", Utf8Str::CaseInsensitive) == 0)
+            if (value.compare("low", com::Utf8Str::CaseInsensitive) == 0)
             {
                 this->ScreenSettings.Audio.uHz       = 8000;
@@ -251 +250 @@
                 this->ScreenSettings.Audio.cChannels = 1;
             }
-            else if (value.startsWith("med" /* "med[ium]" */, Utf8Str::CaseInsensitive) == 0)
+            else if (value.startsWith("med" /* "med[ium]" */, com::Utf8Str::CaseInsensitive) == 0)
             {
                 /* Stay with the default set above. */
             }
-            else if (value.compare("high", Utf8Str::CaseInsensitive) == 0)
+            else if (value.compare("high", com::Utf8Str::CaseInsensitive) == 0)
             {
                 this->ScreenSettings.Audio.uHz       = 48000;