Changeset 75926 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Dec 3, 2018 9:52:50 PM (6 years ago)

Author:

vboxsync

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

127132

Message:

Main,Frontends: s/FileName/Filename/g (API); Took a shot a completing the code for populating IGuestFsObjInfo. bugref:9320

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -482 +482 @@
  * @param pulFrameHeight may be updated with a desired frame height
  * @param pulBitRate may be updated with a desired bit rate
- * @param ppszFileName may be updated with a desired file name
+ * @param ppszFilename may be updated with a desired file name
  */
 static void parse_environ(uint32_t *pulFrameWidth, uint32_t *pulFrameHeight,
-                          uint32_t *pulBitRate, const char **ppszFileName)
+                          uint32_t *pulBitRate, const char **ppszFilename)
 {
     const char *pszEnvTemp;
@@ -522 +522 @@
     }
     if ((pszEnvTemp = RTEnvGet("VBOX_RECORDFILE")) != 0)
-        *ppszFileName = pszEnvTemp;
+        *ppszFilename = pszEnvTemp;
 }
 #endif /* VBOX_WITH_RECORDING defined */
@@ -631 +631 @@
     uint32_t ulRecordVideoHeight = 600;
     uint32_t ulRecordVideoRate = 300000;
-    char szRecordFileName[RTPATH_MAX];
-    const char *pszRecordFileNameTemplate = "VBox-%d.webm"; /* .webm container by default. */
+    char szRecordFilename[RTPATH_MAX];
+    const char *pszRecordFilenameTemplate = "VBox-%d.webm"; /* .webm container by default. */
 #endif /* VBOX_WITH_RECORDING */
 #ifdef RT_OS_WINDOWS
@@ -645 +645 @@
 #ifdef VBOX_WITH_RECORDING
     /* Parse the environment */
-    parse_environ(&ulRecordVideoWidth, &ulRecordVideoHeight, &ulRecordVideoRate, &pszRecordFileNameTemplate);
+    parse_environ(&ulRecordVideoWidth, &ulRecordVideoHeight, &ulRecordVideoRate, &pszRecordFilenameTemplate);
 #endif
 
@@ -791 +791 @@
                 break;
             case 'f':
-                pszRecordFileNameTemplate = ValueUnion.psz;
+                pszRecordFilenameTemplate = ValueUnion.psz;
                 break;
 #endif /* VBOX_WITH_RECORDING defined */
@@ -834 +834 @@
     }
     /* Make sure we only have %d or %u (or none) in the file name specified */
-    char *pcPercent = (char*)strchr(pszRecordFileNameTemplate, '%');
+    char *pcPercent = (char*)strchr(pszRecordFilenameTemplate, '%');
     if (pcPercent != 0 && *(pcPercent + 1) != 'd' && *(pcPercent + 1) != 'u')
     {
@@ -846 +846 @@
         return 1;
     }
-    RTStrPrintf(&szRecordFileName[0], RTPATH_MAX, pszRecordFileNameTemplate, RTProcSelf());
+    RTStrPrintf(&szRecordFilename[0], RTPATH_MAX, pszRecordFilenameTemplate, RTProcSelf());
 #endif /* defined VBOX_WITH_RECORDING */
 
@@ -972 +972 @@
             {
                 CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(Enabled)(TRUE));
-                CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(FileName)(Bstr(szRecordFileName).raw()));
+                CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(Filename)(Bstr(szRecordFilename).raw()));
                 CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(VideoWidth)(ulRecordVideoWidth));
                 CHECK_ERROR_BREAK(saRecordScreenScreens[i], COMSETTER(VideoHeight)(ulRecordVideoHeight));