VirtualBox

Changeset 75361 in vbox for trunk/include


Ignore:
Timestamp:
Nov 9, 2018 12:56:40 PM (6 years ago)
Author:
vboxsync
Message:

Recording/Main: Renamed the IRecord* interfaces again to IRecording* to make it more standardized.

Location:
trunk/include/VBox
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/log.h

    r75341 r75361  
    594594    /** Main group, IProgressTaskCompletedEvent. */
    595595    LOG_GROUP_MAIN_PROGRESSTASKCOMPLETEDEVENT,
    596     /** Main group, IRecordChangedEvent. */
    597     LOG_GROUP_MAIN_RECORDCHANGEDEVENT,
    598     /** Main group, IRecordSettings. */
    599     LOG_GROUP_MAIN_RECORDSETTINGS,
    600     /** Main group, IRecordScreenSettings. */
    601     LOG_GROUP_MAIN_RECORDSCREENSETTINGS,
     596    /** Main group, IRecordingChangedEvent. */
     597    LOG_GROUP_MAIN_RECORDINGCHANGEDEVENT,
     598    /** Main group, IRecordingSettings. */
     599    LOG_GROUP_MAIN_RECORDINGSETTINGS,
     600    /** Main group, IRecordingScreenSettings. */
     601    LOG_GROUP_MAIN_RECORDINGSCREENSETTINGS,
    602602    /** Main group, IReusableEvent. */
    603603    LOG_GROUP_MAIN_REUSABLEEVENT,
    … …  
    11241124    "MAIN_PROGRESSPERCENTAGECHANGEDEVENT", \
    11251125    "MAIN_PROGRESSTASKCOMPLETEDEVENT", \
    1126     "MAIN_RECORDCHANGEDEVENT", \
    1127     "MAIN_RECORDSETTINGS", \
    1128     "MAIN_RECORDSCREENSETTINGS", \
     1126    "MAIN_RECORDINGCHANGEDEVENT", \
     1127    "MAIN_RECORDINGSETTINGS", \
     1128    "MAIN_RECORDINGSCREENSETTINGS", \
    11291129    "MAIN_REUSABLEEVENT", \
    11301130    "MAIN_RUNTIMEERROREVENT", \

  • trunk/include/VBox/settings.h

    r75341 r75361  
    482482
    483483/** List for keeping a recording feature list. */
    484 typedef std::map<RecordFeature_T, bool> RecordFeatureMap;
    485 
    486 struct RecordScreenSettings
    487 {
    488     RecordScreenSettings();
    489 
    490     virtual ~RecordScreenSettings();
     484typedef std::map<RecordingFeature_T, bool> RecordingFeatureMap;
     485
     486struct RecordingScreenSettings
     487{
     488    RecordingScreenSettings();
     489
     490    virtual ~RecordingScreenSettings();
    491491
    492492    void applyDefaults(void);
    … …  
    494494    bool areDefaultSettings(void) const;
    495495
    496     bool isFeatureEnabled(RecordFeature_T enmFeature) const;
    497 
    498     bool operator==(const RecordScreenSettings &d) const;
    499 
    500     bool                 fEnabled;       // requires settings version 1.14 (VirtualBox 4.3)
    501     RecordDestination_T enmDest;        // new since VirtualBox 6.0.
    502     RecordFeatureMap    featureMap;    // new since VirtualBox 6.0.
    503     uint32_t             ulMaxTimeS;    // requires settings version 1.14 (VirtualBox 4.3)
    504     com::Utf8Str         strOptions;    // new since VirtualBox 5.2.
     496    bool isFeatureEnabled(RecordingFeature_T enmFeature) const;
     497
     498    bool operator==(const RecordingScreenSettings &d) const;
     499
     500    bool                   fEnabled;   // requires settings version 1.14 (VirtualBox 4.3)
     501    RecordingDestination_T enmDest;    // new since VirtualBox 6.0.
     502    RecordingFeatureMap    featureMap; // new since VirtualBox 6.0.
     503    uint32_t               ulMaxTimeS; // requires settings version 1.14 (VirtualBox 4.3)
     504    com::Utf8Str           strOptions; // new since VirtualBox 5.2.
    505505
    506506    struct Audio
    507507    {
    508508        Audio()
    509             : enmAudioCodec(RecordAudioCodec_Opus)
     509            : enmAudioCodec(RecordingAudioCodec_Opus)
    510510            , uHz(22050)
    511511            , cBits(16)
    … …  
    513513
    514514        /** The audio codec type to use. */
    515         RecordAudioCodec_T enmAudioCodec; // new since VirtualBox 6.0.
     515        RecordingAudioCodec_T enmAudioCodec; // new since VirtualBox 6.0.
    516516        /** Hz rate. */
    517         uint16_t            uHz;           // new since VirtualBox 6.0.
     517        uint16_t              uHz;           // new since VirtualBox 6.0.
    518518        /** Bits per sample. */
    519         uint8_t             cBits;         // new since VirtualBox 6.0.
     519        uint8_t               cBits;         // new since VirtualBox 6.0.
    520520        /** Number of audio channels. */
    521         uint8_t             cChannels;     // new since VirtualBox 6.0.
     521        uint8_t               cChannels;     // new since VirtualBox 6.0.
    522522    } Audio;
    523523
    … …  
    525525    {
    526526        Video()
    527             : enmCodec(RecordVideoCodec_VP8)
     527            : enmCodec(RecordingVideoCodec_VP8)
    528528            , ulWidth(1024)
    529529            , ulHeight(768)
    … …  
    531531            , ulFPS(25) { }
    532532
    533         RecordVideoCodec_T enmCodec;  // new since VirtualBox 6.0.
    534         uint32_t             ulWidth;   // requires settings version 1.14 (VirtualBox 4.3)
    535         uint32_t             ulHeight;  // requires settings version 1.14 (VirtualBox 4.3)
    536         uint32_t             ulRate;    // requires settings version 1.14 (VirtualBox 4.3)
    537         uint32_t             ulFPS;     // requires settings version 1.14 (VirtualBox 4.3)
     533        RecordingVideoCodec_T enmCodec;  // new since VirtualBox 6.0.
     534        uint32_t              ulWidth;   // requires settings version 1.14 (VirtualBox 4.3)
     535        uint32_t              ulHeight;  // requires settings version 1.14 (VirtualBox 4.3)
     536        uint32_t              ulRate;    // requires settings version 1.14 (VirtualBox 4.3)
     537        uint32_t              ulFPS;     // requires settings version 1.14 (VirtualBox 4.3)
    538538    } Video;
    539539
    … …  
    549549
    550550/** Map for keeping settings per virtual screen. */
    551 typedef std::map<uint32_t, RecordScreenSettings> RecordScreenMap;
    552 
    553 /**
    554  * NOTE: If you add any fields in here, you must update a) the constructor and b)
    555  * the operator== which is used by MachineConfigFile::operator==(), or otherwise
    556  * your settings might never get saved.
    557  */
    558 struct RecordSettings
    559 {
    560     RecordSettings();
     551typedef std::map<uint32_t, RecordingScreenSettings> RecordingScreenMap;
     552
     553/**
     554 * NOTE: If you add any fields in here, you must update a) the constructor and b)
     555 * the operator== which is used by MachineConfigFile::operator==(), or otherwise
     556 * your settings might never get saved.
     557 */
     558struct RecordingSettings
     559{
     560    RecordingSettings();
    561561
    562562    void applyDefaults(void);
    … …  
    564564    bool areDefaultSettings(void) const;
    565565
    566     bool operator==(const RecordSettings &d) const;
    567 
    568     bool            fEnabled;       // requires settings version 1.14 (VirtualBox 4.3)
    569     RecordScreenMap mapScreens;
     566    bool operator==(const RecordingSettings &d) const;
     567
     568    bool               fEnabled;       // requires settings version 1.14 (VirtualBox 4.3)
     569    RecordingScreenMap mapScreens;
    570570};
    571571
    … …  
    10391039
    10401040    BIOSSettings        biosSettings;
    1041     RecordSettings      recordSettings;
     1041    RecordingSettings   recordingSettings;
    10421042    USB                 usbSettings;
    10431043    NetworkAdaptersList llNetworkAdapters;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette