Ticket #13653: 0002-Rename-the-RecordingType-stream-selection-UI-element.patch

File 0002-Rename-the-RecordingType-stream-selection-UI-element.patch, 1.5 KB (added by Gary Buhrmaster, 4 years ago)

Rename the RecordingType? stream selection UI element in recordingprofile.cpp - Renamed to avoid (global) name conflict with RecordingType? enum in libs/libmyth/recordingtypes.h

  • mythtv/libs/libmythtv/recordingprofile.cpp 

    From 9443a247d78d7820eed84383f64dfb9a8b4f0970 Mon Sep 17 00:00:00 2001
From: Gary Buhrmaster <gary.buhrmaster@gmail.com>
Date: Tue, 14 Jul 2020 15:05:21 +0000
Subject: [PATCH 2/7] Rename the RecordingType stream selection UI element in
 recordingprofile.cpp

Renamed to avoid (global) name conflict with RecordingType enum in
libs/libmyth/recordingtypes.h
---
 mythtv/libs/libmythtv/recordingprofile.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mythtv/libs/libmythtv/recordingprofile.cpp b/mythtv/libs/libmythtv/recordingprofile.cpp
index 3434109437..55489718d7 100644
    a b class TranscodeLossless : public MythUICheckBoxSetting, public CodecParamStorage 
    12211221    };
    12221222};
    12231223
    1224 class RecordingType : public MythUIComboBoxSetting, public CodecParamStorage
     1224class RecordingTypeStream : public MythUIComboBoxSetting, public CodecParamStorage
    12251225{
    12261226  public:
    1227     explicit RecordingType(const RecordingProfile &parent) :
     1227    explicit RecordingTypeStream(const RecordingProfile &parent) :
    12281228        MythUIComboBoxSetting(this), CodecParamStorage(this, parent, "recordingtype")
    12291229    {
    12301230        setLabel(QObject::tr("Recording Type"));
    … … void RecordingProfile::CompleteLoad(int profileId, const QString &type, 
    16331633    }
    16341634    else if (type.toUpper() == "DVB")
    16351635    {
    1636         addChild(new RecordingType(*this));
     1636        addChild(new RecordingTypeStream(*this));
    16371637    }
    16381638
    16391639    if (CardUtil::IsTunerSharingCapable(type))