Index: /trunk/doc/manual/en_US/user_VBoxManage.xml =================================================================== --- /trunk/doc/manual/en_US/user_VBoxManage.xml (revision 75364) +++ /trunk/doc/manual/en_US/user_VBoxManage.xml (revision 75365) @@ -1886,5 +1886,5 @@ - + Recording Settings @@ -1900,5 +1900,5 @@ - --record on|off: This + --recording on|off: This option enables or disables recording a VM session into a file. If this option is enabled, recording will start when the @@ -1909,5 +1909,5 @@ - --recordscreens all|<screen ID> + --recordingscreens all|<screen ID> [<screen ID> ...]: This option allows to specify which screens of the VM are being recorded. Each @@ -1918,5 +1918,5 @@ - --recordfile + --recordingfile <filename>: This option sets the filename VirtualBox uses to save the recorded content. @@ -1926,5 +1926,5 @@ - --recordmaxtime + --recordingmaxtime <ms>: This option sets the maximum time in milliseconds the recording will be enabled @@ -1937,5 +1937,5 @@ - --recordmaxsize + --recordingmaxsize <MB>: This option limits the maximum size of the recorded file (in MB). The recording stops @@ -1947,5 +1947,5 @@ - --recordopts <key=value> + --recordingopts <key=value> [,<key=value> ...]: This format can be used to specify additional recording options. These @@ -1958,5 +1958,5 @@ - --recordvideores + --recordingvideores <width>x<height>: This option sets the video resolution (in pixels) of the recorded file. @@ -1966,5 +1966,5 @@ - --recordvideorate + --recordingvideorate <rate>: This option sets the video bitrate in kilobits (kb) per second. Increasing this value makes the @@ -1975,5 +1975,5 @@ - --recordvideofps <fps>: + --recordingvideofps <fps>: This option sets the maximum number of video frames per second (FPS) to be recorded. Frames with a higher frequency will be Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (revision 75364) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (revision 75365) @@ -1855,5 +1855,5 @@ } #ifdef VBOX_WITH_RECORDING - else if (!strcmp(a->argv[1], "record")) + else if (!strcmp(a->argv[1], "recording")) { if (a->argc < 3) Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 75364) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (revision 75365) @@ -713,13 +713,13 @@ #endif #ifdef VBOX_WITH_RECORDING - " [--record on|off]\n" - " [--record screens all| [ ...]]\n" - " [--record filename ]\n" - " [--record videores ]\n" - " [--record videorate ]\n" - " [--record videofps ]\n" - " [--record maxtime ]\n" - " [--record maxfilesize ]\n" - " [--record opts [, ...]]\n" + " [--recording on|off]\n" + " [--recording screens all| [ ...]]\n" + " [--recording filename ]\n" + " [--recording videores ]\n" + " [--recording videorate ]\n" + " [--recording videofps ]\n" + " [--recording maxtime ]\n" + " [--recording maxfilesize ]\n" + " [--recording opts [, ...]]\n" #endif " [--defaultfrontend default|]\n" @@ -832,12 +832,12 @@ " screenshotpng [display] |\n" #ifdef VBOX_WITH_RECORDING - " record on|off |\n" - " record screens all|none|,[...] |\n" - " record filename |\n" - " record videores x |\n" - " record videorate |\n" - " record videofps |\n" - " record maxtime |\n" - " record maxfilesize |\n" + " recording on|off |\n" + " recording screens all|none|,[...] |\n" + " recording filename |\n" + " recording videores x |\n" + " recording videorate |\n" + " recording videofps |\n" + " recording maxtime |\n" + " recording maxfilesize |\n" #endif /* VBOX_WITH_RECORDING */ " setcredentials \n" Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 75364) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (revision 75365) @@ -215,16 +215,16 @@ #endif #ifdef VBOX_WITH_RECORDING - MODIFYVM_RECORD, - MODIFYVM_RECORD_FEATURES, - MODIFYVM_RECORD_SCREENS, - MODIFYVM_RECORD_FILENAME, - MODIFYVM_RECORD_VIDEO_WIDTH, - MODIFYVM_RECORD_VIDEO_HEIGHT, - MODIFYVM_RECORD_VIDEO_RES, - MODIFYVM_RECORD_VIDEO_RATE, - MODIFYVM_RECORD_VIDEO_FPS, - MODIFYVM_RECORD_MAXTIME, - MODIFYVM_RECORD_MAXSIZE, - MODIFYVM_RECORD_OPTIONS, + MODIFYVM_RECORDING, + MODIFYVM_RECORDING_FEATURES, + MODIFYVM_RECORDING_SCREENS, + MODIFYVM_RECORDING_FILENAME, + MODIFYVM_RECORDING_VIDEO_WIDTH, + MODIFYVM_RECORDING_VIDEO_HEIGHT, + MODIFYVM_RECORDING_VIDEO_RES, + MODIFYVM_RECORDING_VIDEO_RATE, + MODIFYVM_RECORDING_VIDEO_FPS, + MODIFYVM_RECORDING_MAXTIME, + MODIFYVM_RECORDING_MAXSIZE, + MODIFYVM_RECORDING_OPTIONS, #endif MODIFYVM_CHIPSET, @@ -395,14 +395,15 @@ { "--chipset", MODIFYVM_CHIPSET, RTGETOPT_REQ_STRING }, #ifdef VBOX_WITH_RECORDING - { "--record", MODIFYVM_RECORD, RTGETOPT_REQ_BOOL_ONOFF }, - { "--recordscreens", MODIFYVM_RECORD_SCREENS, RTGETOPT_REQ_STRING }, - { "--recordfile", MODIFYVM_RECORD_FILENAME, RTGETOPT_REQ_STRING }, - { "--recordmaxtime", MODIFYVM_RECORD_MAXTIME, RTGETOPT_REQ_INT32 }, - { "--recordmaxsize", MODIFYVM_RECORD_MAXSIZE, RTGETOPT_REQ_INT32 }, - { "--recordopts", MODIFYVM_RECORD_OPTIONS, RTGETOPT_REQ_STRING }, - { "--recordoptions", MODIFYVM_RECORD_OPTIONS, RTGETOPT_REQ_STRING }, - { "--recordvideores", MODIFYVM_RECORD_VIDEO_RES, RTGETOPT_REQ_STRING }, - { "--recordvideorate", MODIFYVM_RECORD_VIDEO_RATE, RTGETOPT_REQ_UINT32 }, - { "--recordvideofps", MODIFYVM_RECORD_VIDEO_FPS, RTGETOPT_REQ_UINT32 }, + { "--recording", MODIFYVM_RECORDING, RTGETOPT_REQ_BOOL_ONOFF }, + { "--recordingscreens", MODIFYVM_RECORDING_SCREENS, RTGETOPT_REQ_STRING }, + { "--recordingfile", MODIFYVM_RECORDING_FILENAME, RTGETOPT_REQ_STRING }, + { "--recordingmaxtime", MODIFYVM_RECORDING_MAXTIME, RTGETOPT_REQ_INT32 }, + { "--recordingmaxsize", MODIFYVM_RECORDING_MAXSIZE, RTGETOPT_REQ_INT32 }, + { "--recordingopts", MODIFYVM_RECORDING_OPTIONS, RTGETOPT_REQ_STRING }, + { "--recordingoptions", MODIFYVM_RECORDING_OPTIONS, RTGETOPT_REQ_STRING }, + { "--recordingvideores", MODIFYVM_RECORDING_VIDEO_RES, RTGETOPT_REQ_STRING }, + { "--recordingvideoresolution", MODIFYVM_RECORDING_VIDEO_RES, RTGETOPT_REQ_STRING }, + { "--recordingvideorate", MODIFYVM_RECORDING_VIDEO_RATE, RTGETOPT_REQ_UINT32 }, + { "--recordingvideofps", MODIFYVM_RECORDING_VIDEO_FPS, RTGETOPT_REQ_UINT32 }, #endif { "--autostart-enabled", MODIFYVM_AUTOSTART_ENABLED, RTGETOPT_REQ_BOOL_ONOFF }, @@ -2928,25 +2929,25 @@ } #ifdef VBOX_WITH_RECORDING - case MODIFYVM_RECORD: + case MODIFYVM_RECORDING: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_SCREENS: + case MODIFYVM_RECORDING_SCREENS: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_FILENAME: + case MODIFYVM_RECORDING_FILENAME: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_VIDEO_WIDTH: + case MODIFYVM_RECORDING_VIDEO_WIDTH: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_VIDEO_HEIGHT: + case MODIFYVM_RECORDING_VIDEO_HEIGHT: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_VIDEO_RES: + case MODIFYVM_RECORDING_VIDEO_RES: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_VIDEO_RATE: + case MODIFYVM_RECORDING_VIDEO_RATE: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_VIDEO_FPS: + case MODIFYVM_RECORDING_VIDEO_FPS: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_MAXTIME: + case MODIFYVM_RECORDING_MAXTIME: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_MAXSIZE: + case MODIFYVM_RECORDING_MAXSIZE: RT_FALL_THROUGH(); - case MODIFYVM_RECORD_OPTIONS: + case MODIFYVM_RECORDING_OPTIONS: { ComPtr recordingSettings; @@ -2957,10 +2958,10 @@ switch (c) { - case MODIFYVM_RECORD: + case MODIFYVM_RECORDING: { CHECK_ERROR(recordingSettings, COMSETTER(Enabled)(ValueUnion.f)); break; } - case MODIFYVM_RECORD_SCREENS: + case MODIFYVM_RECORDING_SCREENS: { ULONG cMonitors = 64; @@ -2981,5 +2982,5 @@ break; } - case MODIFYVM_RECORD_FILENAME: + case MODIFYVM_RECORDING_FILENAME: { Bstr bstr; @@ -3002,5 +3003,5 @@ break; } - case MODIFYVM_RECORD_VIDEO_WIDTH: + case MODIFYVM_RECORDING_VIDEO_WIDTH: { for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i) @@ -3008,5 +3009,5 @@ break; } - case MODIFYVM_RECORD_VIDEO_HEIGHT: + case MODIFYVM_RECORDING_VIDEO_HEIGHT: { for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i) @@ -3014,5 +3015,5 @@ break; } - case MODIFYVM_RECORD_VIDEO_RES: + case MODIFYVM_RECORDING_VIDEO_RES: { uint32_t uWidth = 0; @@ -3041,5 +3042,5 @@ break; } - case MODIFYVM_RECORD_VIDEO_RATE: + case MODIFYVM_RECORDING_VIDEO_RATE: { for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i) @@ -3047,5 +3048,5 @@ break; } - case MODIFYVM_RECORD_VIDEO_FPS: + case MODIFYVM_RECORDING_VIDEO_FPS: { for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i) @@ -3053,5 +3054,5 @@ break; } - case MODIFYVM_RECORD_MAXTIME: + case MODIFYVM_RECORDING_MAXTIME: { for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i) @@ -3059,5 +3060,5 @@ break; } - case MODIFYVM_RECORD_MAXSIZE: + case MODIFYVM_RECORDING_MAXSIZE: { for (size_t i = 0; i < saRecordingScreenScreens.size(); ++i) @@ -3065,5 +3066,5 @@ break; } - case MODIFYVM_RECORD_OPTIONS: + case MODIFYVM_RECORDING_OPTIONS: { Bstr bstr(ValueUnion.psz);