VirtualBox

Changeset 105605 in vbox for trunk/src/VBox/Main/src-client


Ignore:
Timestamp:
Aug 6, 2024 2:00:56 PM (9 months ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
164284
Message:

Recording/Main: Renaming: Dropped the superfluous "Settings" suffix of the settings namespace recording classes. This makes those classes easier to find, also for editors which don't support namespace handling, as the same class names were used for the actual implementation classes (i.e. RecordingSettingsImpl.cpp -> RecordingSettings). No functional changes.

Location:
trunk/src/VBox/Main/src-client
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

    r105555 r105605  
    75667566#ifdef VBOX_WITH_RECORDING
    75677567
    7568 int Console::i_recordingGetSettings(settings::RecordingSettings &recording)
     7568int Console::i_recordingGetSettings(settings::Recording &Settings)
    75697569{
    75707570    Assert(mMachine.isNotNull());
    75717571
    7572     recording.applyDefaults();
     7572    Settings.applyDefaults();
    75737573
    75747574    ComPtr<IRecordingSettings> pRecordSettings;
    … …  
    75797579    hrc = pRecordSettings->COMGETTER(Enabled)(&fTemp);
    75807580    AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
    7581     recording.common.fEnabled = RT_BOOL(fTemp);
     7581    Settings.common.fEnabled = RT_BOOL(fTemp);
    75827582
    75837583    SafeIfaceArray<IRecordingScreenSettings> paRecScreens;
    … …  
    75877587    for (unsigned long i = 0; i < (unsigned long)paRecScreens.size(); ++i)
    75887588    {
    7589         settings::RecordingScreenSettings recScreenSettings;
     7589        settings::RecordingScreen recScreenSettings;
    75907590        ComPtr<IRecordingScreenSettings> pRecScreenSettings = paRecScreens[i];
    75917591
    … …  
    76457645        AssertComRCReturn(hrc, VERR_INVALID_PARAMETER);
    76467646
    7647         recording.mapScreens[i] = recScreenSettings;
    7648     }
    7649 
    7650     Assert(recording.mapScreens.size() == paRecScreens.size());
     7647        Settings.mapScreens[i] = recScreenSettings;
     7648    }
     7649
     7650    Assert(Settings.mapScreens.size() == paRecScreens.size());
    76517651
    76527652    return VINF_SUCCESS;
    … …  
    76607660int Console::i_recordingCreate(ComPtr<IProgress> &pProgress)
    76617661{
    7662     settings::RecordingSettings recordingSettings;
    7663     int vrc = i_recordingGetSettings(recordingSettings);
     7662    settings::Recording Settings;
     7663    int vrc = i_recordingGetSettings(Settings);
    76647664    if (RT_SUCCESS(vrc))
    7665         vrc = mRecording.mCtx.Create(this, recordingSettings, pProgress);
     7665        vrc = mRecording.mCtx.Create(this, Settings, pProgress);
    76667666
    76677667    if (RT_FAILURE(vrc))

  • trunk/src/VBox/Main/src-client/DrvAudioRec.cpp

    r105006 r105605  
    206206 * @param   Settings        Recording settings to apply.
    207207 */
    208 int AudioVideoRec::applyConfiguration(const settings::RecordingSettings &Settings)
     208int AudioVideoRec::applyConfiguration(const settings::Recording &Settings)
    209209{
    210210    /** @todo Do some validation here. */
    … …  
    220220
    221221    AssertReturn(mSettings.mapScreens.size() >= 1, VERR_INVALID_PARAMETER);
    222     const settings::RecordingScreenSettings &screenSettings = mSettings.mapScreens[idxScreen];
     222    const settings::RecordingScreen &screenSettings = mSettings.mapScreens[idxScreen];
    223223
    224224    int vrc = pVMM->pfnCFGMR3InsertInteger(pLunCfg, "ContainerType", (uint64_t)screenSettings.enmDest);

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

    r105436 r105605  
    239239 * @param   pProgress           Where to return the created progress object on success.
    240240 */
    241 int RecordingContext::progressCreate(const settings::RecordingSettings &Settings, ComObjPtr<Progress> &pProgress)
     241int RecordingContext::progressCreate(const settings::Recording &Settings, ComObjPtr<Progress> &pProgress)
    242242{
    243243    /* Determine the number of operations the recording progress has.
    … …  
    249249    while (itScreen != Settings.mapScreens.end())
    250250    {
    251         settings::RecordingScreenSettings const &screenSettings = itScreen->second;
     251        settings::RecordingScreen const &screenSettings = itScreen->second;
    252252        if (screenSettings.ulMaxTimeS == 0)
    253253        {
    … …  
    671671 * @param   screenSettings      Reference to recording screen settings to use for initialization.
    672672 */
    673 int RecordingContext::audioInit(const settings::RecordingScreenSettings &screenSettings)
     673int RecordingContext::audioInit(const settings::RecordingScreen &screenSettings)
    674674{
    675675    RecordingAudioCodec_T const enmCodec = screenSettings.Audio.enmCodec;
    … …  
    754754 * @param   pProgress           Progress object returned on success.
    755755 */
    756 int RecordingContext::createInternal(Console *ptrConsole, const settings::RecordingSettings &Settings,
     756int RecordingContext::createInternal(Console *ptrConsole, const settings::Recording &Settings,
    757757                                     ComPtr<IProgress> &pProgress)
    758758{
    … …  
    767767
    768768    /* We always use the audio settings from screen 0, as we multiplex the audio data anyway. */
    769     settings::RecordingScreenSettings const &screen0Settings = itScreen0->second;
     769    settings::RecordingScreen const &screen0Settings = itScreen0->second;
    770770
    771771    vrc = this->audioInit(screen0Settings);
    … …  
    992992 * @returns The recording context's current settings.
    993993 */
    994 const settings::RecordingSettings &RecordingContext::GetConfig(void) const
     994const settings::Recording &RecordingContext::GetConfig(void) const
    995995{
    996996    return m_Settings;
    … …  
    10721072 * @param   pProgress           Progress object returned on success.
    10731073 */
    1074 int RecordingContext::Create(Console *ptrConsole, const settings::RecordingSettings &Settings, ComPtr<IProgress> &pProgress)
     1074int RecordingContext::Create(Console *ptrConsole, const settings::Recording &Settings, ComPtr<IProgress> &pProgress)
    10751075{
    10761076    return createInternal(ptrConsole, Settings, pProgress);

  • trunk/src/VBox/Main/src-client/RecordingCodec.cpp

    r105095 r105605  
    797797 */
    798798static int recordingCodecInitAudio(const PRECORDINGCODEC pCodec,
    799                                    const PRECORDINGCODECCALLBACKS pCallbacks, const settings::RecordingScreenSettings &Settings)
     799                                   const PRECORDINGCODECCALLBACKS pCallbacks, const settings::RecordingScreen &Settings)
    800800{
    801801    AssertReturn(pCodec->Parms.enmType == RECORDINGCODECTYPE_AUDIO, VERR_INVALID_PARAMETER);
    802802
    803803    com::Utf8Str strCodec;
    804     settings::RecordingScreenSettings::audioCodecToString(pCodec->Parms.enmAudioCodec, strCodec);
     804    settings::RecordingScreen::audioCodecToString(pCodec->Parms.enmAudioCodec, strCodec);
    805805    LogRel(("Recording: Initializing audio codec '%s'\n", strCodec.c_str()));
    806806
    … …  
    857857 */
    858858static int recordingCodecInitVideo(const PRECORDINGCODEC pCodec,
    859                                    const PRECORDINGCODECCALLBACKS pCallbacks, const settings::RecordingScreenSettings &Settings)
     859                                   const PRECORDINGCODECCALLBACKS pCallbacks, const settings::RecordingScreen &Settings)
    860860{
    861861    com::Utf8Str strTemp;
    862     settings::RecordingScreenSettings::videoCodecToString(pCodec->Parms.enmVideoCodec, strTemp);
     862    settings::RecordingScreen::videoCodecToString(pCodec->Parms.enmVideoCodec, strTemp);
    863863    LogRel(("Recording: Initializing video codec '%s'\n", strTemp.c_str()));
    864864
    … …  
    10521052 * @param   Settings            Settings to use for initializing the codec.
    10531053 */
    1054 int recordingCodecInit(const PRECORDINGCODEC pCodec, const PRECORDINGCODECCALLBACKS pCallbacks, const settings::RecordingScreenSettings &Settings)
     1054int recordingCodecInit(const PRECORDINGCODEC pCodec, const PRECORDINGCODECCALLBACKS pCallbacks, const settings::RecordingScreen &Settings)
    10551055{
    10561056    int vrc = RTCritSectInit(&pCodec->CritSect);

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

    r105266 r105605  
    4747
    4848
    49 RecordingStream::RecordingStream(RecordingContext *a_pCtx, uint32_t uScreen, const settings::RecordingScreenSettings &Settings)
     49RecordingStream::RecordingStream(RecordingContext *a_pCtx, uint32_t uScreen, const settings::RecordingScreen &Settings)
    5050    : m_enmState(RECORDINGSTREAMSTATE_UNINITIALIZED)
    5151{
    … …  
    6767 * @param   screenSettings      Recording settings to use.
    6868 */
    69 int RecordingStream::open(const settings::RecordingScreenSettings &screenSettings)
     69int RecordingStream::open(const settings::RecordingScreen &screenSettings)
    7070{
    7171    /* Sanity. */
    … …  
    131131 * @returns The recording stream's used configuration.
    132132 */
    133 const settings::RecordingScreenSettings &RecordingStream::GetConfig(void) const
     133const settings::RecordingScreen &RecordingStream::GetConfig(void) const
    134134{
    135135    return m_ScreenSettings;
    … …  
    710710 * @param   Settings            Recording screen configuration to use for initialization.
    711711 */
    712 int RecordingStream::Init(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordingScreenSettings &Settings)
     712int RecordingStream::Init(RecordingContext *pCtx, uint32_t uScreen, const settings::RecordingScreen &Settings)
    713713{
    714714    return initInternal(pCtx, uScreen, Settings);
    … …  
    724724 */
    725725int RecordingStream::initInternal(RecordingContext *pCtx, uint32_t uScreen,
    726                                   const settings::RecordingScreenSettings &screenSettings)
     726                                  const settings::RecordingScreen &screenSettings)
    727727{
    728728    AssertReturn(m_enmState == RECORDINGSTREAMSTATE_UNINITIALIZED, VERR_WRONG_ORDER);
    … …  
    739739    m_ScreenSettings = screenSettings;
    740740
    741     settings::RecordingScreenSettings *pSettings = &m_ScreenSettings;
     741    settings::RecordingScreen *pSettings = &m_ScreenSettings;
    742742
    743743    int vrc = RTCritSectInit(&m_CritSect);
    … …  
    10481048 * @param   screenSettings      Screen settings to use.
    10491049 */
    1050 int RecordingStream::initVideo(const settings::RecordingScreenSettings &screenSettings)
     1050int RecordingStream::initVideo(const settings::RecordingScreen &screenSettings)
    10511051{
    10521052    /* Sanity. */
Note: See TracChangeset for help on using the changeset viewer.

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