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 |
1221 | 1221 | }; |
1222 | 1222 | }; |
1223 | 1223 | |
1224 | | class RecordingType : public MythUIComboBoxSetting, public CodecParamStorage |
| 1224 | class RecordingTypeStream : public MythUIComboBoxSetting, public CodecParamStorage |
1225 | 1225 | { |
1226 | 1226 | public: |
1227 | | explicit RecordingType(const RecordingProfile &parent) : |
| 1227 | explicit RecordingTypeStream(const RecordingProfile &parent) : |
1228 | 1228 | MythUIComboBoxSetting(this), CodecParamStorage(this, parent, "recordingtype") |
1229 | 1229 | { |
1230 | 1230 | setLabel(QObject::tr("Recording Type")); |
… |
… |
void RecordingProfile::CompleteLoad(int profileId, const QString &type, |
1633 | 1633 | } |
1634 | 1634 | else if (type.toUpper() == "DVB") |
1635 | 1635 | { |
1636 | | addChild(new RecordingType(*this)); |
| 1636 | addChild(new RecordingTypeStream(*this)); |
1637 | 1637 | } |
1638 | 1638 | |
1639 | 1639 | if (CardUtil::IsTunerSharingCapable(type)) |