From 14c313647625f01b1d86a47ddd47f75a0969f724 Mon Sep 17 00:00:00 2001 From: David Hampton Date: Tue, 30 Jul 2024 12:53:06 -0400 Subject: [PATCH] tidy: Initialize enum values in a consistent manner. If more than one value is in an enum is assigned a value, then all values in the enum should be assigned a value. All changes made by clang-tidy. White space cleanup and decimal to hex conversions by hand. https://clang.llvm.org/extra/clang-tidy/checks/readability/enum-initial-value.html --- .../mythnetvision/mythnetvision/nettree.h | 2 +- mythtv/libs/libmythbase/mythpower.h | 2 +- .../libs/libmythtv/captions/cc708decoder.cpp | 8 +- mythtv/libs/libmythtv/captions/cc708window.h | 6 +- .../libmythtv/channelscan/channelimporter.h | 18 +- mythtv/libs/libmythtv/dtvconfparserhelpers.h | 26 +- mythtv/libs/libmythtv/mheg/mhegic.h | 2 +- mythtv/libs/libmythtv/mythcodecid.h | 418 +++++++++--------- mythtv/libs/libmythtv/mythframe.h | 68 +-- mythtv/libs/libmythtv/tv.h | 34 +- mythtv/libs/libmythtv/videoouttypes.h | 46 +- mythtv/libs/libmythui/mythuibuttonlist.h | 8 +- mythtv/libs/libmythupnp/msocketdevice.h | 20 +- mythtv/programs/mythfrontend/playbackbox.h | 4 +- mythtv/programs/mythfrontend/proglist.h | 26 +- mythtv/programs/mythfrontend/videodlg.h | 4 +- 16 files changed, 346 insertions(+), 346 deletions(-) diff --git a/mythplugins/mythnetvision/mythnetvision/nettree.h b/mythplugins/mythnetvision/mythnetvision/nettree.h index c7d3a4b4447..8ceea2aeafe 100644 --- a/mythplugins/mythnetvision/mythnetvision/nettree.h +++ b/mythplugins/mythnetvision/mythnetvision/nettree.h @@ -19,7 +19,7 @@ enum DialogType : std::uint8_t { DLG_DEFAULT = 0, DLG_GALLERY = 0x1, DLG_TREE = 0x2, - DLG_BROWSER = 0x4, dtLast }; + DLG_BROWSER = 0x4, dtLast = 0x5 }; enum TreeNodeType : std::int8_t { kSubFolder = -1, diff --git a/mythtv/libs/libmythbase/mythpower.h b/mythtv/libs/libmythbase/mythpower.h index 9d2ffee247c..629a62ca0fe 100644 --- a/mythtv/libs/libmythbase/mythpower.h +++ b/mythtv/libs/libmythbase/mythpower.h @@ -29,7 +29,7 @@ class MBASE_PUBLIC MythPower : public QObject, public ReferenceCounter BatteryLow = 10, BatteryFull = 100, UnknownPower = 101, - Unset + Unset = 102, }; enum Feature : std::uint8_t diff --git a/mythtv/libs/libmythtv/captions/cc708decoder.cpp b/mythtv/libs/libmythtv/captions/cc708decoder.cpp index 30fa98619cf..e96606d890a 100644 --- a/mythtv/libs/libmythtv/captions/cc708decoder.cpp +++ b/mythtv/libs/libmythtv/captions/cc708decoder.cpp @@ -97,10 +97,10 @@ enum C0 : std::uint8_t enum C1 : std::uint8_t { - CW0=0x80, CW1, CW2, CW3, CW4, CW5, CW6, CW7, - CLW, DSW, HDW, TGW, DLW, DLY, DLC, RST, - SPA=0x90, SPC, SPL, SWA=0x97, - DF0, DF1, DF2, DF3, DF4, DF5, DF6, DF7, + CW0=0x80, CW1=0x81, CW2=0x82, CW3=0x83, CW4=0x84, CW5=0x85, CW6=0x86, CW7=0x87, + CLW=0x88, DSW=0x89, HDW=0x8A, TGW=0x8B, DLW=0x8C, DLY=0x8D, DLC=0x8E, RST=0x8F, + SPA=0x90, SPC=0x91, SPL=0x92, SWA=0x97, + DF0=0x98, DF1=0x99, DF2=0x9A, DF3=0x9B, DF4=0x9C, DF5=0x9D, DF6=0x9E, DF7=0x9F, }; using cc_table = std::array; diff --git a/mythtv/libs/libmythtv/captions/cc708window.h b/mythtv/libs/libmythtv/captions/cc708window.h index 1e66165748f..6745c113f4e 100644 --- a/mythtv/libs/libmythtv/captions/cc708window.h +++ b/mythtv/libs/libmythtv/captions/cc708window.h @@ -243,9 +243,9 @@ class MTV_PUBLIC CC708Window bool m_visible {false}; public: enum : std::uint8_t { - kAnchorUpperLeft = 0, kAnchorUpperCenter, kAnchorUpperRight, - kAnchorCenterLeft = 3, kAnchorCenter, kAnchorCenterRight, - kAnchorLowerLeft = 6, kAnchorLowerCenter, kAnchorLowerRight, + kAnchorUpperLeft = 0, kAnchorUpperCenter = 1, kAnchorUpperRight = 2, + kAnchorCenterLeft = 3, kAnchorCenter = 4, kAnchorCenterRight = 5, + kAnchorLowerLeft = 6, kAnchorLowerCenter = 7, kAnchorLowerRight = 8, }; uint m_anchor_point {0}; uint m_relative_pos {0}; diff --git a/mythtv/libs/libmythtv/channelscan/channelimporter.h b/mythtv/libs/libmythtv/channelscan/channelimporter.h index f43bf6b8592..1b96d5ffae6 100644 --- a/mythtv/libs/libmythtv/channelscan/channelimporter.h +++ b/mythtv/libs/libmythtv/channelscan/channelimporter.h @@ -110,18 +110,18 @@ class MTV_PUBLIC ChannelImporter : public QObject kChannelTypeNonConflictingFirst = kChannelTypeFirst, kATSCNonConflicting = kChannelTypeFirst, - kDVBNonConflicting, - kSCTENonConflicting, - kMPEGNonConflicting, - kNTSCNonConflicting, + kDVBNonConflicting = 1, + kSCTENonConflicting = 2, + kMPEGNonConflicting = 3, + kNTSCNonConflicting = 4, kChannelTypeNonConflictingLast = kNTSCNonConflicting, - kChannelTypeConflictingFirst, + kChannelTypeConflictingFirst = 5, kATSCConflicting = kChannelTypeConflictingFirst, - kDVBConflicting, - kSCTEConflicting, - kMPEGConflicting, - kNTSCConflicting, + kDVBConflicting = 6, + kSCTEConflicting = 7, + kMPEGConflicting = 8, + kNTSCConflicting = 9, kChannelTypeConflictingLast = kNTSCConflicting, kChannelTypeLast = kChannelTypeConflictingLast, }; diff --git a/mythtv/libs/libmythtv/dtvconfparserhelpers.h b/mythtv/libs/libmythtv/dtvconfparserhelpers.h index 7298d102303..228da24d903 100644 --- a/mythtv/libs/libmythtv/dtvconfparserhelpers.h +++ b/mythtv/libs/libmythtv/dtvconfparserhelpers.h @@ -355,19 +355,19 @@ class DTVModulation : public DTVParamHelper public: enum Types : std::uint16_t { - kModulationQPSK, - kModulationQAM16, - kModulationQAM32, - kModulationQAM64, - kModulationQAM128, - kModulationQAM256, - kModulationQAMAuto, - kModulation8VSB, - kModulation16VSB, - kModulation8PSK, - kModulation16APSK, - kModulation32APSK, - kModulationDQPSK, + kModulationQPSK = 0x000, + kModulationQAM16 = 0x001, + kModulationQAM32 = 0x002, + kModulationQAM64 = 0x003, + kModulationQAM128 = 0x004, + kModulationQAM256 = 0x005, + kModulationQAMAuto = 0x006, + kModulation8VSB = 0x007, + kModulation16VSB = 0x008, + kModulation8PSK = 0x009, + kModulation16APSK = 0x00A, + kModulation32APSK = 0x00B, + kModulationDQPSK = 0x00C, kModulationInvalid = 0x100, /* for removed modulations */ kModulationAnalog = 0x200, /* for analog channel scanner */ }; diff --git a/mythtv/libs/libmythtv/mheg/mhegic.h b/mythtv/libs/libmythtv/mheg/mhegic.h index 2c4930dd408..9467bb01d05 100644 --- a/mythtv/libs/libmythtv/mheg/mhegic.h +++ b/mythtv/libs/libmythtv/mheg/mhegic.h @@ -32,7 +32,7 @@ class MHInteractionChannel : public QObject // Is a file ready to read? bool CheckFile(const QString &csPath, const QByteArray &cert = QByteArray()); // Read a file - enum EResult : std::int8_t { kError = -1, kSuccess = 0, kPending }; + enum EResult : std::int8_t { kError = -1, kSuccess = 0, kPending = 1 }; EResult GetFile(const QString &csPath, QByteArray &data, const QByteArray &cert = QByteArray() ); diff --git a/mythtv/libs/libmythtv/mythcodecid.h b/mythtv/libs/libmythtv/mythcodecid.h index ddf8a64c1e6..84c334e1450 100644 --- a/mythtv/libs/libmythtv/mythcodecid.h +++ b/mythtv/libs/libmythtv/mythcodecid.h @@ -16,278 +16,278 @@ enum MythCodecID : std::uint8_t kCodec_NORMAL_BEGIN = kCodec_NONE, - kCodec_NUV_RTjpeg, - kCodec_NUV_MPEG4, - - kCodec_MPEG1, - kCodec_MPEG2, - kCodec_H263, - kCodec_MPEG4, - kCodec_H264, - kCodec_VC1, - kCodec_WMV3, - kCodec_VP8, - kCodec_VP9, - kCodec_HEVC, - kCodec_AV1, - - kCodec_NORMAL_END, + kCodec_NUV_RTjpeg = 1, + kCodec_NUV_MPEG4 = 2, + + kCodec_MPEG1 = 3, + kCodec_MPEG2 = 4, + kCodec_H263 = 5, + kCodec_MPEG4 = 6, + kCodec_H264 = 7, + kCodec_VC1 = 8, + kCodec_WMV3 = 9, + kCodec_VP8 = 10, + kCodec_VP9 = 11, + kCodec_HEVC = 12, + kCodec_AV1 = 13, + + kCodec_NORMAL_END = 14, kCodec_VDPAU_BEGIN = kCodec_NORMAL_END, - kCodec_MPEG1_VDPAU, - kCodec_MPEG2_VDPAU, - kCodec_H263_VDPAU, - kCodec_MPEG4_VDPAU, - kCodec_H264_VDPAU, - kCodec_VC1_VDPAU, - kCodec_WMV3_VDPAU, - kCodec_VP8_VDPAU, - kCodec_VP9_VDPAU, - kCodec_HEVC_VDPAU, - kCodec_AV1_VDPAU, + kCodec_MPEG1_VDPAU = 15, + kCodec_MPEG2_VDPAU = 16, + kCodec_H263_VDPAU = 17, + kCodec_MPEG4_VDPAU = 18, + kCodec_H264_VDPAU = 19, + kCodec_VC1_VDPAU = 20, + kCodec_WMV3_VDPAU = 21, + kCodec_VP8_VDPAU = 22, + kCodec_VP9_VDPAU = 23, + kCodec_HEVC_VDPAU = 24, + kCodec_AV1_VDPAU = 25, - kCodec_VDPAU_END, + kCodec_VDPAU_END = 26, kCodec_VDPAU_DEC_BEGIN = kCodec_VDPAU_END, - kCodec_MPEG1_VDPAU_DEC, - kCodec_MPEG2_VDPAU_DEC, - kCodec_H263_VDPAU_DEC, - kCodec_MPEG4_VDPAU_DEC, - kCodec_H264_VDPAU_DEC, - kCodec_VC1_VDPAU_DEC, - kCodec_WMV3_VDPAU_DEC, - kCodec_VP8_VDPAU_DEC, - kCodec_VP9_VDPAU_DEC, - kCodec_HEVC_VDPAU_DEC, - kCodec_AV1_VDPAU_DEC, + kCodec_MPEG1_VDPAU_DEC = 27, + kCodec_MPEG2_VDPAU_DEC = 28, + kCodec_H263_VDPAU_DEC = 29, + kCodec_MPEG4_VDPAU_DEC = 30, + kCodec_H264_VDPAU_DEC = 31, + kCodec_VC1_VDPAU_DEC = 32, + kCodec_WMV3_VDPAU_DEC = 33, + kCodec_VP8_VDPAU_DEC = 34, + kCodec_VP9_VDPAU_DEC = 35, + kCodec_HEVC_VDPAU_DEC = 36, + kCodec_AV1_VDPAU_DEC = 37, - kCodec_VDPAU_DEC_END, + kCodec_VDPAU_DEC_END = 38, kCodec_VAAPI_BEGIN = kCodec_VDPAU_DEC_END, - kCodec_MPEG1_VAAPI, - kCodec_MPEG2_VAAPI, - kCodec_H263_VAAPI, - kCodec_MPEG4_VAAPI, - kCodec_H264_VAAPI, - kCodec_VC1_VAAPI, - kCodec_WMV3_VAAPI, - kCodec_VP8_VAAPI, - kCodec_VP9_VAAPI, - kCodec_HEVC_VAAPI, - kCodec_AV1_VAAPI, + kCodec_MPEG1_VAAPI = 39, + kCodec_MPEG2_VAAPI = 40, + kCodec_H263_VAAPI = 41, + kCodec_MPEG4_VAAPI = 42, + kCodec_H264_VAAPI = 43, + kCodec_VC1_VAAPI = 44, + kCodec_WMV3_VAAPI = 45, + kCodec_VP8_VAAPI = 46, + kCodec_VP9_VAAPI = 47, + kCodec_HEVC_VAAPI = 48, + kCodec_AV1_VAAPI = 49, - kCodec_VAAPI_END, + kCodec_VAAPI_END = 50, kCodec_VAAPI_DEC_BEGIN = kCodec_VAAPI_END, - kCodec_MPEG1_VAAPI_DEC, - kCodec_MPEG2_VAAPI_DEC, - kCodec_H263_VAAPI_DEC, - kCodec_MPEG4_VAAPI_DEC, - kCodec_H264_VAAPI_DEC, - kCodec_VC1_VAAPI_DEC, - kCodec_WMV3_VAAPI_DEC, - kCodec_VP8_VAAPI_DEC, - kCodec_VP9_VAAPI_DEC, - kCodec_HEVC_VAAPI_DEC, - kCodec_AV1_VAAPI_DEC, + kCodec_MPEG1_VAAPI_DEC = 51, + kCodec_MPEG2_VAAPI_DEC = 52, + kCodec_H263_VAAPI_DEC = 53, + kCodec_MPEG4_VAAPI_DEC = 54, + kCodec_H264_VAAPI_DEC = 55, + kCodec_VC1_VAAPI_DEC = 56, + kCodec_WMV3_VAAPI_DEC = 57, + kCodec_VP8_VAAPI_DEC = 58, + kCodec_VP9_VAAPI_DEC = 59, + kCodec_HEVC_VAAPI_DEC = 60, + kCodec_AV1_VAAPI_DEC = 61, - kCodec_VAAPI_DEC_END, + kCodec_VAAPI_DEC_END = 62, kCodec_DXVA2_BEGIN = kCodec_VAAPI_DEC_END, - kCodec_MPEG1_DXVA2, - kCodec_MPEG2_DXVA2, - kCodec_H263_DXVA2, - kCodec_MPEG4_DXVA2, - kCodec_H264_DXVA2, - kCodec_VC1_DXVA2, - kCodec_WMV3_DXVA2, - kCodec_VP8_DXVA2, - kCodec_VP9_DXVA2, - kCodec_HEVC_DXVA2, - kCodec_AV1_DXVA2, + kCodec_MPEG1_DXVA2 = 63, + kCodec_MPEG2_DXVA2 = 64, + kCodec_H263_DXVA2 = 65, + kCodec_MPEG4_DXVA2 = 66, + kCodec_H264_DXVA2 = 67, + kCodec_VC1_DXVA2 = 68, + kCodec_WMV3_DXVA2 = 69, + kCodec_VP8_DXVA2 = 70, + kCodec_VP9_DXVA2 = 71, + kCodec_HEVC_DXVA2 = 72, + kCodec_AV1_DXVA2 = 73, - kCodec_DXVA2_END, + kCodec_DXVA2_END = 74, kCodec_MEDIACODEC_BEGIN = kCodec_DXVA2_END, - kCodec_MPEG1_MEDIACODEC, - kCodec_MPEG2_MEDIACODEC, - kCodec_H263_MEDIACODEC, - kCodec_MPEG4_MEDIACODEC, - kCodec_H264_MEDIACODEC, - kCodec_VC1_MEDIACODEC, - kCodec_WMV3_MEDIACODEC, - kCodec_VP8_MEDIACODEC, - kCodec_VP9_MEDIACODEC, - kCodec_HEVC_MEDIACODEC, - kCodec_AV1_MEDIACODEC, + kCodec_MPEG1_MEDIACODEC = 75, + kCodec_MPEG2_MEDIACODEC = 76, + kCodec_H263_MEDIACODEC = 77, + kCodec_MPEG4_MEDIACODEC = 78, + kCodec_H264_MEDIACODEC = 79, + kCodec_VC1_MEDIACODEC = 80, + kCodec_WMV3_MEDIACODEC = 81, + kCodec_VP8_MEDIACODEC = 82, + kCodec_VP9_MEDIACODEC = 83, + kCodec_HEVC_MEDIACODEC = 84, + kCodec_AV1_MEDIACODEC = 85, - kCodec_MEDIACODEC_END, + kCodec_MEDIACODEC_END = 86, kCodec_MEDIACODEC_DEC_BEGIN = kCodec_MEDIACODEC_END, - kCodec_MPEG1_MEDIACODEC_DEC, - kCodec_MPEG2_MEDIACODEC_DEC, - kCodec_H263_MEDIACODEC_DEC, - kCodec_MPEG4_MEDIACODEC_DEC, - kCodec_H264_MEDIACODEC_DEC, - kCodec_VC1_MEDIACODEC_DEC, - kCodec_WMV3_MEDIACODEC_DEC, - kCodec_VP8_MEDIACODEC_DEC, - kCodec_VP9_MEDIACODEC_DEC, - kCodec_HEVC_MEDIACODEC_DEC, - kCodec_AV1_MEDIACODEC_DEC, + kCodec_MPEG1_MEDIACODEC_DEC = 87, + kCodec_MPEG2_MEDIACODEC_DEC = 88, + kCodec_H263_MEDIACODEC_DEC = 89, + kCodec_MPEG4_MEDIACODEC_DEC = 90, + kCodec_H264_MEDIACODEC_DEC = 91, + kCodec_VC1_MEDIACODEC_DEC = 92, + kCodec_WMV3_MEDIACODEC_DEC = 93, + kCodec_VP8_MEDIACODEC_DEC = 94, + kCodec_VP9_MEDIACODEC_DEC = 95, + kCodec_HEVC_MEDIACODEC_DEC = 96, + kCodec_AV1_MEDIACODEC_DEC = 97, - kCodec_MEDIACODEC_DEC_END, + kCodec_MEDIACODEC_DEC_END = 98, kCodec_NVDEC_BEGIN = kCodec_MEDIACODEC_DEC_END, - kCodec_MPEG1_NVDEC, - kCodec_MPEG2_NVDEC, - kCodec_H263_NVDEC, - kCodec_MPEG4_NVDEC, - kCodec_H264_NVDEC, - kCodec_VC1_NVDEC, - kCodec_WMV3_NVDEC, - kCodec_VP8_NVDEC, - kCodec_VP9_NVDEC, - kCodec_HEVC_NVDEC, - kCodec_AV1_NVDEC, + kCodec_MPEG1_NVDEC = 99, + kCodec_MPEG2_NVDEC = 100, + kCodec_H263_NVDEC = 101, + kCodec_MPEG4_NVDEC = 102, + kCodec_H264_NVDEC = 103, + kCodec_VC1_NVDEC = 104, + kCodec_WMV3_NVDEC = 105, + kCodec_VP8_NVDEC = 106, + kCodec_VP9_NVDEC = 107, + kCodec_HEVC_NVDEC = 108, + kCodec_AV1_NVDEC = 109, - kCodec_NVDEC_END, + kCodec_NVDEC_END = 110, kCodec_NVDEC_DEC_BEGIN = kCodec_NVDEC_END, - kCodec_MPEG1_NVDEC_DEC, - kCodec_MPEG2_NVDEC_DEC, - kCodec_H263_NVDEC_DEC, - kCodec_MPEG4_NVDEC_DEC, - kCodec_H264_NVDEC_DEC, - kCodec_VC1_NVDEC_DEC, - kCodec_WMV3_NVDEC_DEC, - kCodec_VP8_NVDEC_DEC, - kCodec_VP9_NVDEC_DEC, - kCodec_HEVC_NVDEC_DEC, - kCodec_AV1_NVDEC_DEC, + kCodec_MPEG1_NVDEC_DEC = 111, + kCodec_MPEG2_NVDEC_DEC = 112, + kCodec_H263_NVDEC_DEC = 113, + kCodec_MPEG4_NVDEC_DEC = 114, + kCodec_H264_NVDEC_DEC = 115, + kCodec_VC1_NVDEC_DEC = 116, + kCodec_WMV3_NVDEC_DEC = 117, + kCodec_VP8_NVDEC_DEC = 118, + kCodec_VP9_NVDEC_DEC = 119, + kCodec_HEVC_NVDEC_DEC = 120, + kCodec_AV1_NVDEC_DEC = 121, - kCodec_NVDEC_DEC_END, + kCodec_NVDEC_DEC_END = 122, kCodec_VTB_BEGIN = kCodec_NVDEC_DEC_END, - kCodec_MPEG1_VTB, - kCodec_MPEG2_VTB, - kCodec_H263_VTB, - kCodec_MPEG4_VTB, - kCodec_H264_VTB, - kCodec_VC1_VTB, - kCodec_WMV3_VTB, - kCodec_VP8_VTB, - kCodec_VP9_VTB, - kCodec_HEVC_VTB, - kCodec_AV1_VTB, + kCodec_MPEG1_VTB = 123, + kCodec_MPEG2_VTB = 124, + kCodec_H263_VTB = 125, + kCodec_MPEG4_VTB = 126, + kCodec_H264_VTB = 127, + kCodec_VC1_VTB = 128, + kCodec_WMV3_VTB = 129, + kCodec_VP8_VTB = 130, + kCodec_VP9_VTB = 131, + kCodec_HEVC_VTB = 132, + kCodec_AV1_VTB = 133, - kCodec_VTB_END, + kCodec_VTB_END = 134, kCodec_VTB_DEC_BEGIN = kCodec_VTB_END, - kCodec_MPEG1_VTB_DEC, - kCodec_MPEG2_VTB_DEC, - kCodec_H263_VTB_DEC, - kCodec_MPEG4_VTB_DEC, - kCodec_H264_VTB_DEC, - kCodec_VC1_VTB_DEC, - kCodec_WMV3_VTB_DEC, - kCodec_VP8_VTB_DEC, - kCodec_VP9_VTB_DEC, - kCodec_HEVC_VTB_DEC, - kCodec_AV1_VTB_DEC, + kCodec_MPEG1_VTB_DEC = 135, + kCodec_MPEG2_VTB_DEC = 136, + kCodec_H263_VTB_DEC = 137, + kCodec_MPEG4_VTB_DEC = 138, + kCodec_H264_VTB_DEC = 139, + kCodec_VC1_VTB_DEC = 140, + kCodec_WMV3_VTB_DEC = 141, + kCodec_VP8_VTB_DEC = 142, + kCodec_VP9_VTB_DEC = 143, + kCodec_HEVC_VTB_DEC = 144, + kCodec_AV1_VTB_DEC = 145, - kCodec_VTB_DEC_END, + kCodec_VTB_DEC_END = 146, kCodec_V4L2_BEGIN = kCodec_VTB_DEC_END, - kCodec_MPEG1_V4L2, - kCodec_MPEG2_V4L2, - kCodec_H263_V4L2, - kCodec_MPEG4_V4L2, - kCodec_H264_V4L2, - kCodec_VC1_V4L2, - kCodec_WMV3_V4L2, - kCodec_VP8_V4L2, - kCodec_VP9_V4L2, - kCodec_HEVC_V4L2, - kCodec_AV1_V4L2, + kCodec_MPEG1_V4L2 = 147, + kCodec_MPEG2_V4L2 = 148, + kCodec_H263_V4L2 = 149, + kCodec_MPEG4_V4L2 = 150, + kCodec_H264_V4L2 = 151, + kCodec_VC1_V4L2 = 152, + kCodec_WMV3_V4L2 = 153, + kCodec_VP8_V4L2 = 154, + kCodec_VP9_V4L2 = 155, + kCodec_HEVC_V4L2 = 156, + kCodec_AV1_V4L2 = 157, - kCodec_V4L2_END, + kCodec_V4L2_END = 158, kCodec_V4L2_DEC_BEGIN = kCodec_V4L2_END, - kCodec_MPEG1_V4L2_DEC, - kCodec_MPEG2_V4L2_DEC, - kCodec_H263_V4L2_DEC, - kCodec_MPEG4_V4L2_DEC, - kCodec_H264_V4L2_DEC, - kCodec_VC1_V4L2_DEC, - kCodec_WMV3_V4L2_DEC, - kCodec_VP8_V4L2_DEC, - kCodec_VP9_V4L2_DEC, - kCodec_HEVC_V4L2_DEC, - kCodec_AV1_V4L2_DEC, + kCodec_MPEG1_V4L2_DEC = 159, + kCodec_MPEG2_V4L2_DEC = 160, + kCodec_H263_V4L2_DEC = 161, + kCodec_MPEG4_V4L2_DEC = 162, + kCodec_H264_V4L2_DEC = 163, + kCodec_VC1_V4L2_DEC = 164, + kCodec_WMV3_V4L2_DEC = 165, + kCodec_VP8_V4L2_DEC = 166, + kCodec_VP9_V4L2_DEC = 167, + kCodec_HEVC_V4L2_DEC = 168, + kCodec_AV1_V4L2_DEC = 169, - kCodec_V4L2_DEC_END, + kCodec_V4L2_DEC_END = 170, kCodec_MMAL_BEGIN = kCodec_V4L2_DEC_END, - kCodec_MPEG1_MMAL, - kCodec_MPEG2_MMAL, - kCodec_H263_MMAL, - kCodec_MPEG4_MMAL, - kCodec_H264_MMAL, - kCodec_VC1_MMAL, - kCodec_WMV3_MMAL, - kCodec_VP8_MMAL, - kCodec_VP9_MMAL, - kCodec_HEVC_MMAL, - kCodec_AV1_MMAL, + kCodec_MPEG1_MMAL = 171, + kCodec_MPEG2_MMAL = 172, + kCodec_H263_MMAL = 173, + kCodec_MPEG4_MMAL = 174, + kCodec_H264_MMAL = 175, + kCodec_VC1_MMAL = 176, + kCodec_WMV3_MMAL = 177, + kCodec_VP8_MMAL = 178, + kCodec_VP9_MMAL = 179, + kCodec_HEVC_MMAL = 180, + kCodec_AV1_MMAL = 181, - kCodec_MMAL_END, + kCodec_MMAL_END = 182, kCodec_MMAL_DEC_BEGIN = kCodec_MMAL_END, - kCodec_MPEG1_MMAL_DEC, - kCodec_MPEG2_MMAL_DEC, - kCodec_H263_MMAL_DEC, - kCodec_MPEG4_MMAL_DEC, - kCodec_H264_MMAL_DEC, - kCodec_VC1_MMAL_DEC, - kCodec_WMV3_MMAL_DEC, - kCodec_VP8_MMAL_DEC, - kCodec_VP9_MMAL_DEC, - kCodec_HEVC_MMAL_DEC, - kCodec_AV1_MMAL_DEC, + kCodec_MPEG1_MMAL_DEC = 183, + kCodec_MPEG2_MMAL_DEC = 184, + kCodec_H263_MMAL_DEC = 185, + kCodec_MPEG4_MMAL_DEC = 186, + kCodec_H264_MMAL_DEC = 187, + kCodec_VC1_MMAL_DEC = 188, + kCodec_WMV3_MMAL_DEC = 189, + kCodec_VP8_MMAL_DEC = 190, + kCodec_VP9_MMAL_DEC = 191, + kCodec_HEVC_MMAL_DEC = 192, + kCodec_AV1_MMAL_DEC = 193, - kCodec_MMAL_DEC_END, + kCodec_MMAL_DEC_END = 194, kCodec_DRMPRIME_BEGIN = kCodec_MMAL_DEC_END, - kCodec_MPEG1_DRMPRIME, - kCodec_MPEG2_DRMPRIME, - kCodec_H263_DRMPRIME, - kCodec_MPEG4_DRMPRIME, - kCodec_H264_DRMPRIME, - kCodec_VC1_DRMPRIME, - kCodec_WMV3_DRMPRIME, - kCodec_VP8_DRMPRIME, - kCodec_VP9_DRMPRIME, - kCodec_HEVC_DRMPRIME, - kCodec_AV1_DRMPRIME, - - kCodec_DRMPRIME_END + kCodec_MPEG1_DRMPRIME = 195, + kCodec_MPEG2_DRMPRIME = 196, + kCodec_H263_DRMPRIME = 197, + kCodec_MPEG4_DRMPRIME = 198, + kCodec_H264_DRMPRIME = 199, + kCodec_VC1_DRMPRIME = 200, + kCodec_WMV3_DRMPRIME = 201, + kCodec_VP8_DRMPRIME = 202, + kCodec_VP9_DRMPRIME = 203, + kCodec_HEVC_DRMPRIME = 204, + kCodec_AV1_DRMPRIME = 205, + + kCodec_DRMPRIME_END = 206 }; // MythCodecID convenience functions diff --git a/mythtv/libs/libmythtv/mythframe.h b/mythtv/libs/libmythtv/mythframe.h index 2ab6ace6649..132f9cb9a58 100644 --- a/mythtv/libs/libmythtv/mythframe.h +++ b/mythtv/libs/libmythtv/mythframe.h @@ -22,46 +22,46 @@ enum VideoFrameType : std::int8_t FMT_NONE = -1, // YV12 and variants FMT_YV12 = 0, - FMT_YUV420P9, - FMT_YUV420P10, - FMT_YUV420P12, - FMT_YUV420P14, - FMT_YUV420P16, + FMT_YUV420P9 = 1, + FMT_YUV420P10 = 2, + FMT_YUV420P12 = 3, + FMT_YUV420P14 = 4, + FMT_YUV420P16 = 5, // RGB variants - FMT_RGB24, - FMT_BGRA, - FMT_RGB32, ///< endian dependent format, ARGB or BGRA - FMT_ARGB32, - FMT_RGBA32, + FMT_RGB24 = 6, + FMT_BGRA = 7, + FMT_RGB32 = 8, ///< endian dependent format, ARGB or BGRA + FMT_ARGB32 = 9, + FMT_RGBA32 = 10, // YUV422P and variants - FMT_YUV422P, - FMT_YUV422P9, - FMT_YUV422P10, - FMT_YUV422P12, - FMT_YUV422P14, - FMT_YUV422P16, + FMT_YUV422P = 11, + FMT_YUV422P9 = 12, + FMT_YUV422P10 = 13, + FMT_YUV422P12 = 14, + FMT_YUV422P14 = 15, + FMT_YUV422P16 = 16, // YUV444P and variants - FMT_YUV444P, - FMT_YUV444P9, - FMT_YUV444P10, - FMT_YUV444P12, - FMT_YUV444P14, - FMT_YUV444P16, + FMT_YUV444P = 17, + FMT_YUV444P9 = 18, + FMT_YUV444P10 = 19, + FMT_YUV444P12 = 20, + FMT_YUV444P14 = 21, + FMT_YUV444P16 = 22, // Packed YUV - FMT_YUY2, + FMT_YUY2 = 23, // NV12 and variants - FMT_NV12, - FMT_P010, - FMT_P016, + FMT_NV12 = 24, + FMT_P010 = 25, + FMT_P016 = 26, // hardware formats - FMT_VDPAU, - FMT_VAAPI, - FMT_DXVA2, - FMT_MMAL, - FMT_MEDIACODEC, - FMT_VTB, - FMT_NVDEC, - FMT_DRMPRIME + FMT_VDPAU = 27, + FMT_VAAPI = 28, + FMT_DXVA2 = 29, + FMT_MMAL = 30, + FMT_MEDIACODEC = 31, + FMT_VTB = 32, + FMT_NVDEC = 33, + FMT_DRMPRIME = 34 }; enum MythDeintType : std::uint8_t diff --git a/mythtv/libs/libmythtv/tv.h b/mythtv/libs/libmythtv/tv.h index aa5dcff7920..29ce585a8fd 100644 --- a/mythtv/libs/libmythtv/tv.h +++ b/mythtv/libs/libmythtv/tv.h @@ -39,13 +39,13 @@ enum ChannelChangeDirection : std::uint8_t /// Used to request ProgramInfo for channel browsing. enum BrowseDirection : std::int8_t { - BROWSE_INVALID = -1, - BROWSE_SAME = 0, ///< Fetch browse information on current channel and time - BROWSE_UP, ///< Fetch information on previous channel - BROWSE_DOWN, ///< Fetch information on next channel - BROWSE_LEFT, ///< Fetch information on current channel in the past - BROWSE_RIGHT, ///< Fetch information on current channel in the future - BROWSE_FAVORITE ///< Fetch information on the next favorite channel + BROWSE_INVALID = -1, + BROWSE_SAME = 0, ///< Fetch browse information on current channel and time + BROWSE_UP = 1, ///< Fetch information on previous channel + BROWSE_DOWN = 2, ///< Fetch information on next channel + BROWSE_LEFT = 3, ///< Fetch information on current channel in the past + BROWSE_RIGHT = 4, ///< Fetch information on current channel in the future + BROWSE_FAVORITE = 5 ///< Fetch information on the next favorite channel }; /** \brief TVState is an enumeration of the states used by TV and TVRec. @@ -63,33 +63,33 @@ enum TVState : std::int8_t * recording and the user has control over the channel and * the recorder to use. */ - kState_WatchingLiveTV, + kState_WatchingLiveTV = 1, /** \brief Watching Pre-recorded is a TV only state for when we are * watching a pre-existing recording. */ - kState_WatchingPreRecorded, + kState_WatchingPreRecorded = 2, /** \brief Watching Video is the state when we are watching a video and is not * a dvd or BD */ - kState_WatchingVideo, + kState_WatchingVideo = 3, /** \brief Watching DVD is the state when we are watching a DVD */ - kState_WatchingDVD, + kState_WatchingDVD = 4, /** \brief Watching BD is the state when we are watching a BD */ - kState_WatchingBD, + kState_WatchingBD = 5, /** \brief Watching Recording is the state for when we are watching * an in progress recording, but the user does not have control * over the channel and recorder to use. */ - kState_WatchingRecording, + kState_WatchingRecording = 6, /** \brief Recording Only is a TVRec only state for when we are recording * a program, but there is no one currently watching it. */ - kState_RecordingOnly, + kState_RecordingOnly = 7, /** \brief This is a placeholder state which we never actually enter, * but is returned by GetState() when we are in the process * of changing the state. */ - kState_ChangingState, + kState_ChangingState = 8, }; inline TVState myth_deque_init(const TVState */*state*/) { return (TVState)(0); } @@ -135,8 +135,8 @@ enum CommSkipMode : std::uint8_t kCommSkipOff = 0, kCommSkipOn = 1, kCommSkipNotify = 2, - kCommSkipCount, - kCommSkipIncr, + kCommSkipCount = 3, + kCommSkipIncr = 4, }; QString toString(CommSkipMode type); #endif diff --git a/mythtv/libs/libmythtv/videoouttypes.h b/mythtv/libs/libmythtv/videoouttypes.h index 7f0b954f3cc..86cb12b3380 100644 --- a/mythtv/libs/libmythtv/videoouttypes.h +++ b/mythtv/libs/libmythtv/videoouttypes.h @@ -60,35 +60,35 @@ enum ZoomDirection : std::uint8_t enum AspectOverrideMode : std::int8_t { kAspect_Toggle = -1, - kAspect_Off = 0, - kAspect_4_3, - kAspect_16_9, - kAspect_14_9, // added after 16:9 so as not to upset existing setups. - kAspect_2_35_1, - kAspect_END + kAspect_Off = 0, + kAspect_4_3 = 1, + kAspect_16_9 = 2, + kAspect_14_9 = 3, // added after 16:9 so as not to upset existing setups. + kAspect_2_35_1 = 4, + kAspect_END = 5 }; enum AdjustFillMode : std::int8_t { kAdjustFill_Toggle = -1, kAdjustFill_Off = 0, - kAdjustFill_Half, - kAdjustFill_Full, - kAdjustFill_HorizontalStretch, - kAdjustFill_VerticalStretch, - kAdjustFill_HorizontalFill, - kAdjustFill_VerticalFill, - kAdjustFill_END, - kAdjustFill_AutoDetect_DefaultOff, - kAdjustFill_AutoDetect_DefaultHalf, + kAdjustFill_Half = 1, + kAdjustFill_Full = 2, + kAdjustFill_HorizontalStretch = 3, + kAdjustFill_VerticalStretch = 4, + kAdjustFill_HorizontalFill = 5, + kAdjustFill_VerticalFill = 6, + kAdjustFill_END = 7, + kAdjustFill_AutoDetect_DefaultOff = 8, + kAdjustFill_AutoDetect_DefaultHalf = 9, }; enum LetterBoxColour : std::int8_t { kLetterBoxColour_Toggle = -1, kLetterBoxColour_Black = 0, - kLetterBoxColour_Gray25, - kLetterBoxColour_END + kLetterBoxColour_Gray25 = 1, + kLetterBoxColour_END = 2 }; enum FrameScanType : std::int8_t @@ -105,12 +105,12 @@ enum PictureAttribute : std::uint8_t kPictureAttribute_None = 0, kPictureAttribute_MIN = 0, kPictureAttribute_Brightness = 1, - kPictureAttribute_Contrast, - kPictureAttribute_Colour, - kPictureAttribute_Hue, - kPictureAttribute_Range, - kPictureAttribute_Volume, - kPictureAttribute_MAX + kPictureAttribute_Contrast = 2, + kPictureAttribute_Colour = 3, + kPictureAttribute_Hue = 4, + kPictureAttribute_Range = 5, + kPictureAttribute_Volume = 6, + kPictureAttribute_MAX = 7 }; enum PictureAttributeSupported : std::uint8_t diff --git a/mythtv/libs/libmythui/mythuibuttonlist.h b/mythtv/libs/libmythui/mythuibuttonlist.h index 90558ad48ba..1e244bb67dd 100644 --- a/mythtv/libs/libmythui/mythuibuttonlist.h +++ b/mythtv/libs/libmythui/mythuibuttonlist.h @@ -44,8 +44,8 @@ class MUI_PUBLIC MythUIButtonListItem enum CheckState : std::int8_t { CantCheck = -1, NotChecked = 0, - HalfChecked, - FullChecked + HalfChecked = 1, + FullChecked = 2 }; MythUIButtonListItem(MythUIButtonList *lbtype, QString text, @@ -279,8 +279,8 @@ class MUI_PUBLIC MythUIButtonList : public MythUIType enum ArrangeType : std::uint8_t { ArrangeFixed, ArrangeFill, ArrangeSpread, ArrangeStack }; enum WrapStyle : std::int8_t - { WrapCaptive = -1, WrapNone = 0, WrapSelect, WrapItems, - WrapFlowing }; + { WrapCaptive = -1, WrapNone = 0, WrapSelect = 1, + WrapItems = 2, WrapFlowing = 3 }; void DrawSelf(MythPainter *p, int xoffset, int yoffset, int alphaMod, QRect clipRect) override; // MythUIType diff --git a/mythtv/libs/libmythupnp/msocketdevice.h b/mythtv/libs/libmythupnp/msocketdevice.h index 44f30cdc42b..021cdcf13d7 100644 --- a/mythtv/libs/libmythupnp/msocketdevice.h +++ b/mythtv/libs/libmythupnp/msocketdevice.h @@ -145,17 +145,17 @@ class UPNP_PUBLIC MSocketDevice: public QIODevice enum Error : std::uint8_t { - NoError, - AlreadyBound, - Inaccessible, - NoResources, - InternalError, + NoError = 0, + AlreadyBound = 1, + Inaccessible = 2, + NoResources = 3, + InternalError = 4, Bug = InternalError, // ### remove in 4.0? - Impossible, - NoFiles, - ConnectionRefused, - NetworkFailure, - UnknownError + Impossible = 5, + NoFiles = 6, + ConnectionRefused = 7, + NetworkFailure = 8, + UnknownError = 9 }; Error error() const; diff --git a/mythtv/programs/mythfrontend/playbackbox.h b/mythtv/programs/mythfrontend/playbackbox.h index fa923c6e87f..c23bfeb56c1 100644 --- a/mythtv/programs/mythfrontend/playbackbox.h +++ b/mythtv/programs/mythfrontend/playbackbox.h @@ -74,14 +74,14 @@ class PlaybackBox : public ScheduleCommon Categories = 4, CategoriesRecGroups = 5, RecGroups = 6, - ViewTypes, // placeholder value, not in database + ViewTypes = 7, // placeholder value, not in database }; // Sort function when TitlesOnly. Values are stored in database. enum ViewTitleSort : std::uint8_t { TitleSortAlphabetical = 0, TitleSortRecPriority = 1, - TitleSortMethods, // placeholder value, not in database + TitleSortMethods = 2, // placeholder value, not in database }; enum ViewMask : std::uint16_t { diff --git a/mythtv/programs/mythfrontend/proglist.h b/mythtv/programs/mythfrontend/proglist.h index ab6eee7b888..23d7347c419 100644 --- a/mythtv/programs/mythfrontend/proglist.h +++ b/mythtv/programs/mythfrontend/proglist.h @@ -15,19 +15,19 @@ enum ProgListType : std::uint8_t { plUnknown = 0, plTitle = 1, - plTitleSearch, - plKeywordSearch, - plPeopleSearch, - plPowerSearch, - plSQLSearch, - plNewListings, - plMovies, - plCategory, - plChannel, - plTime, - plRecordid, - plStoredSearch, - plPreviouslyRecorded + plTitleSearch = 2, + plKeywordSearch = 3, + plPeopleSearch = 4, + plPowerSearch = 5, + plSQLSearch = 6, + plNewListings = 7, + plMovies = 8, + plCategory = 9, + plChannel = 10, + plTime = 11, + plRecordid = 12, + plStoredSearch = 13, + plPreviouslyRecorded = 14 }; class ProgLister : public ScheduleCommon diff --git a/mythtv/programs/mythfrontend/videodlg.h b/mythtv/programs/mythfrontend/videodlg.h index 870fa5f99b9..b74de512fe4 100644 --- a/mythtv/programs/mythfrontend/videodlg.h +++ b/mythtv/programs/mythfrontend/videodlg.h @@ -36,13 +36,13 @@ class VideoDialog : public MythScreenType public: enum DialogType : std::uint8_t { DLG_DEFAULT = 0, DLG_BROWSER = 0x1, DLG_GALLERY = 0x2, - DLG_TREE = 0x4, DLG_MANAGER = 0x8, dtLast }; + DLG_TREE = 0x4, DLG_MANAGER = 0x8, dtLast = 0x9 }; enum BrowseType : std::uint16_t { BRS_FOLDER = 0, BRS_GENRE = 0x1, BRS_CATEGORY = 0x2, BRS_YEAR = 0x4, BRS_DIRECTOR = 0x8, BRS_CAST = 0x10, BRS_USERRATING = 0x20, BRS_INSERTDATE = 0x40, - BRS_TVMOVIE = 0x80, BRS_STUDIO = 0x100, btLast }; + BRS_TVMOVIE = 0x80, BRS_STUDIO = 0x100, btLast = 0x101 }; using VideoListPtr = simple_ref_ptr; using VideoListDeathDelayPtr = QPointer;