Skip to content

Commit 6252e0c

Browse files
authored
Merge pull request #24 from VeithMetro/development/actions-warnings
[Actions] [Warnings] Treating warnings as errors in GitHub Actions, fixing warnings
2 parents 294360f + 45d3d7c commit 6252e0c

File tree

6 files changed

+82
-81
lines changed

6 files changed

+82
-81
lines changed

.github/workflows/Build ThunderLibraries on Linux.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
- name: Build ThunderLibraries
7171
run: |
7272
cmake -G Ninja -S ThunderLibraries -B ${{matrix.build_type}}/build/ThunderLibraries \
73+
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror" \
7374
-DCMAKE_INSTALL_PREFIX="${{matrix.build_type}}/install/usr" \
7475
-DCMAKE_MODULE_PATH="${PWD}/${{matrix.build_type}}/install/usr/include/WPEFramework/Modules" \
7576
-DBROADCAST=ON \

Source/broadcast/Implementation/V4L/Tuner.cpp

Lines changed: 77 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -44,91 +44,91 @@ namespace Broadcast {
4444
};
4545

4646
static constexpr conversion_entry _tableSystemType[] = {
47-
{ .from = ITuner::DVB | ITuner::Cable | ITuner::B, .to = SYS_DVBC_ANNEX_B },
48-
{ .from = ITuner::DVB | ITuner::Cable | ITuner::C, .to = SYS_DVBC_ANNEX_C },
49-
{ .from = ITuner::DVB | ITuner::Terrestrial | ITuner::NoAnnex, .to = SYS_DVBT },
50-
{ .from = ITuner::DVB | ITuner::Terrestrial | ITuner::A, .to = SYS_DVBT2 },
51-
{ .from = ITuner::DVB | ITuner::Satellite | ITuner::NoAnnex, .to = SYS_DVBS },
52-
{ .from = ITuner::DVB | ITuner::Satellite | ITuner::A, .to = SYS_DVBS2 },
53-
{ .from = ITuner::ISDB | ITuner::Satellite | ITuner::NoAnnex, .to = SYS_ISDBS },
54-
{ .from = ITuner::ISDB | ITuner::Terrestrial | ITuner::NoAnnex, .to = SYS_ISDBT },
55-
{ .from = ITuner::ISDB | ITuner::Cable | ITuner::NoAnnex, .to = SYS_ISDBC }
47+
{ (ITuner::DVB | ITuner::Cable | ITuner::B), SYS_DVBC_ANNEX_B },
48+
{ (ITuner::DVB | ITuner::Cable | ITuner::C), SYS_DVBC_ANNEX_C },
49+
{ (ITuner::DVB | ITuner::Terrestrial | ITuner::NoAnnex), SYS_DVBT },
50+
{ (ITuner::DVB | ITuner::Terrestrial | ITuner::A), SYS_DVBT2 },
51+
{ (ITuner::DVB | ITuner::Satellite | ITuner::NoAnnex), SYS_DVBS },
52+
{ (ITuner::DVB | ITuner::Satellite | ITuner::A), SYS_DVBS2 },
53+
{ (ITuner::ISDB | ITuner::Satellite | ITuner::NoAnnex), SYS_ISDBS },
54+
{ (ITuner::ISDB | ITuner::Terrestrial | ITuner::NoAnnex), SYS_ISDBT },
55+
{ (ITuner::ISDB | ITuner::Cable | ITuner::NoAnnex), SYS_ISDBC }
5656
};
5757

5858
static constexpr conversion_entry _tableInversion[] = {
59-
{ .from = Broadcast::Auto, .to = INVERSION_AUTO },
60-
{ .from = Broadcast::Normal, .to = INVERSION_OFF },
61-
{ .from = Broadcast::Inverted, .to = INVERSION_ON }
59+
{ Broadcast::Auto, INVERSION_AUTO },
60+
{ Broadcast::Normal, INVERSION_OFF },
61+
{ Broadcast::Inverted, INVERSION_ON }
6262
};
6363
static constexpr conversion_entry _tableFEC[] = {
64-
{ .from = Broadcast::FEC_INNER_NONE, .to = FEC_NONE },
65-
{ .from = Broadcast::FEC_INNER_UNKNOWN, .to = FEC_AUTO },
66-
{ .from = Broadcast::FEC_1_2, .to = FEC_1_2 },
67-
{ .from = Broadcast::FEC_2_3, .to = FEC_2_3 },
68-
{ .from = Broadcast::FEC_2_5, .to = FEC_2_5 },
69-
{ .from = Broadcast::FEC_3_4, .to = FEC_3_4 },
70-
{ .from = Broadcast::FEC_3_5, .to = FEC_3_5 },
71-
{ .from = Broadcast::FEC_4_5, .to = FEC_4_5 },
72-
{ .from = Broadcast::FEC_5_6, .to = FEC_5_6 },
73-
{ .from = Broadcast::FEC_6_7, .to = FEC_6_7 },
74-
{ .from = Broadcast::FEC_7_8, .to = FEC_7_8 },
75-
{ .from = Broadcast::FEC_8_9, .to = FEC_8_9 },
76-
{ .from = Broadcast::FEC_9_10, .to = FEC_9_10 }
64+
{ Broadcast::FEC_INNER_NONE, FEC_NONE },
65+
{ Broadcast::FEC_INNER_UNKNOWN, FEC_AUTO },
66+
{ Broadcast::FEC_1_2, FEC_1_2 },
67+
{ Broadcast::FEC_2_3, FEC_2_3 },
68+
{ Broadcast::FEC_2_5, FEC_2_5 },
69+
{ Broadcast::FEC_3_4, FEC_3_4 },
70+
{ Broadcast::FEC_3_5, FEC_3_5 },
71+
{ Broadcast::FEC_4_5, FEC_4_5 },
72+
{ Broadcast::FEC_5_6, FEC_5_6 },
73+
{ Broadcast::FEC_6_7, FEC_6_7 },
74+
{ Broadcast::FEC_7_8, FEC_7_8 },
75+
{ Broadcast::FEC_8_9, FEC_8_9 },
76+
{ Broadcast::FEC_9_10, FEC_9_10 }
7777
};
7878
static constexpr conversion_entry _tableModulation[] = {
79-
{ .from = Broadcast::HORIZONTAL_QPSK, .to = QPSK },
80-
{ .from = Broadcast::VERTICAL_QPSK, .to = QPSK },
81-
{ .from = Broadcast::LEFT_QPSK, .to = QPSK },
82-
{ .from = Broadcast::RIGHT_QPSK, .to = QPSK },
83-
{ .from = Broadcast::HORIZONTAL_8PSK, .to = PSK_8 },
84-
{ .from = Broadcast::VERTICAL_8PSK, .to = PSK_8 },
85-
{ .from = Broadcast::LEFT_8PSK, .to = PSK_8 },
86-
{ .from = Broadcast::RIGHT_8PSK, .to = PSK_8 },
87-
{ .from = Broadcast::QAM16, .to = QAM_16 },
88-
{ .from = Broadcast::QAM32, .to = QAM_32 },
89-
{ .from = Broadcast::QAM64, .to = QAM_64 },
90-
{ .from = Broadcast::QAM128, .to = QAM_128 },
91-
{ .from = Broadcast::QAM256, .to = QAM_256 },
79+
{ Broadcast::HORIZONTAL_QPSK, QPSK },
80+
{ Broadcast::VERTICAL_QPSK, QPSK },
81+
{ Broadcast::LEFT_QPSK, QPSK },
82+
{ Broadcast::RIGHT_QPSK, QPSK },
83+
{ Broadcast::HORIZONTAL_8PSK, PSK_8 },
84+
{ Broadcast::VERTICAL_8PSK, PSK_8 },
85+
{ Broadcast::LEFT_8PSK, PSK_8 },
86+
{ Broadcast::RIGHT_8PSK, PSK_8 },
87+
{ Broadcast::QAM16, QAM_16 },
88+
{ Broadcast::QAM32, QAM_32 },
89+
{ Broadcast::QAM64, QAM_64 },
90+
{ Broadcast::QAM128, QAM_128 },
91+
{ Broadcast::QAM256, QAM_256 },
9292
};
9393
static constexpr conversion_entry _tableTransmission[] = {
94-
{ .from = Broadcast::TRANSMISSION_AUTO, .to = TRANSMISSION_MODE_AUTO },
95-
{ .from = Broadcast::TRANSMISSION_1K, .to = TRANSMISSION_MODE_1K },
96-
{ .from = Broadcast::TRANSMISSION_2K, .to = TRANSMISSION_MODE_2K },
97-
{ .from = Broadcast::TRANSMISSION_4K, .to = TRANSMISSION_MODE_4K },
98-
{ .from = Broadcast::TRANSMISSION_8K, .to = TRANSMISSION_MODE_8K },
99-
{ .from = Broadcast::TRANSMISSION_16K, .to = TRANSMISSION_MODE_16K },
100-
{ .from = Broadcast::TRANSMISSION_32K, .to = TRANSMISSION_MODE_32K },
101-
{ .from = Broadcast::TRANSMISSION_C3780, .to = TRANSMISSION_MODE_C3780 },
102-
{ .from = Broadcast::TRANSMISSION_C1, .to = TRANSMISSION_MODE_C1 }
94+
{ Broadcast::TRANSMISSION_AUTO, TRANSMISSION_MODE_AUTO },
95+
{ Broadcast::TRANSMISSION_1K, TRANSMISSION_MODE_1K },
96+
{ Broadcast::TRANSMISSION_2K, TRANSMISSION_MODE_2K },
97+
{ Broadcast::TRANSMISSION_4K, TRANSMISSION_MODE_4K },
98+
{ Broadcast::TRANSMISSION_8K, TRANSMISSION_MODE_8K },
99+
{ Broadcast::TRANSMISSION_16K, TRANSMISSION_MODE_16K },
100+
{ Broadcast::TRANSMISSION_32K, TRANSMISSION_MODE_32K },
101+
{ Broadcast::TRANSMISSION_C3780, TRANSMISSION_MODE_C3780 },
102+
{ Broadcast::TRANSMISSION_C1, TRANSMISSION_MODE_C1 }
103103
};
104104
static constexpr conversion_entry _tableGuard[] = {
105-
{ .from = Broadcast::GUARD_AUTO, .to = GUARD_INTERVAL_AUTO },
106-
{ .from = Broadcast::GUARD_1_4, .to = GUARD_INTERVAL_1_4 },
107-
{ .from = Broadcast::GUARD_1_8, .to = GUARD_INTERVAL_1_8 },
108-
{ .from = Broadcast::GUARD_1_16, .to = GUARD_INTERVAL_1_16 },
109-
{ .from = Broadcast::GUARD_1_32, .to = GUARD_INTERVAL_1_32 },
110-
{ .from = Broadcast::GUARD_1_128, .to = GUARD_INTERVAL_1_128 },
111-
{ .from = Broadcast::GUARD_19_128, .to = GUARD_INTERVAL_19_128 },
112-
{ .from = Broadcast::GUARD_19_256, .to = GUARD_INTERVAL_19_256 }
105+
{ Broadcast::GUARD_AUTO, GUARD_INTERVAL_AUTO },
106+
{ Broadcast::GUARD_1_4, GUARD_INTERVAL_1_4 },
107+
{ Broadcast::GUARD_1_8, GUARD_INTERVAL_1_8 },
108+
{ Broadcast::GUARD_1_16, GUARD_INTERVAL_1_16 },
109+
{ Broadcast::GUARD_1_32, GUARD_INTERVAL_1_32 },
110+
{ Broadcast::GUARD_1_128, GUARD_INTERVAL_1_128 },
111+
{ Broadcast::GUARD_19_128, GUARD_INTERVAL_19_128 },
112+
{ Broadcast::GUARD_19_256, GUARD_INTERVAL_19_256 }
113113
};
114114
static constexpr conversion_entry _tableHierarchy[] = {
115-
{ .from = Broadcast::NoHierarchy, .to = HIERARCHY_NONE },
116-
{ .from = Broadcast::AutoHierarchy, .to = HIERARCHY_AUTO },
117-
{ .from = Broadcast::Hierarchy1, .to = HIERARCHY_1 },
118-
{ .from = Broadcast::Hierarchy2, .to = HIERARCHY_2 },
119-
{ .from = Broadcast::Hierarchy4, .to = HIERARCHY_4 }
115+
{ Broadcast::NoHierarchy, HIERARCHY_NONE },
116+
{ Broadcast::AutoHierarchy, HIERARCHY_AUTO },
117+
{ Broadcast::Hierarchy1, HIERARCHY_1 },
118+
{ Broadcast::Hierarchy2, HIERARCHY_2 },
119+
{ Broadcast::Hierarchy4, HIERARCHY_4 }
120120
};
121121
/*
122122
static constexpr conversion_entry _tablePilot[] = {
123-
{ .from = Broadcast::PILOT_AUTO, .to = PILOT_AUTO },
124-
{ .from = Broadcast::PILOT_ON, .to = PILOT_ON },
125-
{ .from = Broadcast::PILOT_OFF, .to = PILOT_OFF }
123+
{ Broadcast::PILOT_AUTO, PILOT_AUTO },
124+
{ Broadcast::PILOT_ON, PILOT_ON },
125+
{ Broadcast::PILOT_OFF, PILOT_OFF }
126126
};
127127
static constexpr conversion_entry _tableRollOff[] = {
128-
{ .from = Broadcast::HIERARCHY_AUTO, .to = ROLLOFF_AUTO },
129-
{ .from = Broadcast::ROLLOFF_20, .to = ROLLOFF_20 },
130-
{ .from = Broadcast::ROLLOFF_25, .to = ROLLOFF_25 },
131-
{ .from = Broadcast::ROLLOFF_35, .to = ROLLOFF_35 }
128+
{ Broadcast::HIERARCHY_AUTO, ROLLOFF_AUTO },
129+
{ Broadcast::ROLLOFF_20, ROLLOFF_20 },
130+
{ Broadcast::ROLLOFF_25, ROLLOFF_25 },
131+
{ Broadcast::ROLLOFF_35, ROLLOFF_35 }
132132
};
133133
*/
134134

@@ -628,9 +628,9 @@ POP_WARNING()
628628

629629
Property(props[propertyCount++], DTV_TUNE, 0);
630630

631-
struct dtv_properties dtv_prop = {
632-
.num = propertyCount, .props = props
633-
};
631+
struct dtv_properties dtv_prop;
632+
dtv_prop.num = propertyCount;
633+
dtv_prop.props = props;
634634

635635
_state = IDLE;
636636

@@ -776,13 +776,13 @@ POP_WARNING()
776776
}
777777

778778
unsigned int delta = _lastState ^ status;
779-
if (delta & FE_HAS_SIGNAL) TRACE_L1 ("FE_HAS_SIGNAL: %s", status & FE_HAS_SIGNAL ? _T("true") : _T("false"));
780-
if (delta & FE_HAS_CARRIER) TRACE_L1 ("FE_HAS_CARRIER: %s", status & FE_HAS_CARRIER ? _T("true") : _T("false"));
781-
if (delta & FE_HAS_VITERBI) TRACE_L1 ("FE_HAS_VITERBI: %s", status & FE_HAS_VITERBI ? _T("true") : _T("false"));
782-
if (delta & FE_HAS_SYNC) TRACE_L1 ("FE_HAS_SYNC: %s", status & FE_HAS_SYNC ? _T("true") : _T("false"));
783-
if (delta & FE_TIMEDOUT) TRACE_L1 ("FE_TIMEDOUT: %s", status & FE_TIMEDOUT ? _T("true") : _T("false"));
784-
if (delta & FE_REINIT) TRACE_L1 ("FE_REINIT: %s", status & FE_REINIT ? _T("true") : _T("false"));
785-
if (delta & FE_HAS_LOCK) TRACE_L1 ("FE_HAS_LOCK: %s", status & FE_HAS_LOCK ? _T("true") : _T("false"));
779+
if (delta & FE_HAS_SIGNAL) { TRACE_L1 ("FE_HAS_SIGNAL: %s", status & FE_HAS_SIGNAL ? _T("true") : _T("false")); }
780+
if (delta & FE_HAS_CARRIER) { TRACE_L1 ("FE_HAS_CARRIER: %s", status & FE_HAS_CARRIER ? _T("true") : _T("false")); }
781+
if (delta & FE_HAS_VITERBI) { TRACE_L1 ("FE_HAS_VITERBI: %s", status & FE_HAS_VITERBI ? _T("true") : _T("false")); }
782+
if (delta & FE_HAS_SYNC) { TRACE_L1 ("FE_HAS_SYNC: %s", status & FE_HAS_SYNC ? _T("true") : _T("false")); }
783+
if (delta & FE_TIMEDOUT) { TRACE_L1 ("FE_TIMEDOUT: %s", status & FE_TIMEDOUT ? _T("true") : _T("false")); }
784+
if (delta & FE_REINIT) { TRACE_L1 ("FE_REINIT: %s", status & FE_REINIT ? _T("true") : _T("false")); }
785+
if (delta & FE_HAS_LOCK) { TRACE_L1 ("FE_HAS_LOCK: %s", status & FE_HAS_LOCK ? _T("true") : _T("false")); }
786786
_lastState = status;
787787
}
788788
#endif

Source/broadcast/Networks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace Broadcast {
5050
}
5151

5252
public:
53-
virtual void Activated(ITuner* tuner) override
53+
virtual void Activated(ITuner* /* tuner */) override
5454
{
5555
}
5656
virtual void Deactivated(ITuner* tuner) override

Source/broadcast/Services.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace Broadcast {
4949
}
5050

5151
public:
52-
virtual void Activated(ITuner* tuner) override
52+
virtual void Activated(ITuner* /* tuner */) override
5353
{
5454
}
5555
virtual void Deactivated(ITuner* tuner) override

Source/broadcast/TimeDate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ namespace Broadcast {
4949
}
5050

5151
public:
52-
virtual void Activated(ITuner* tuner) override
52+
virtual void Activated(ITuner* /* tuner */) override
5353
{
5454
}
5555
virtual void Deactivated(ITuner* tuner) override

Source/broadcast/test/BroadcastTester.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ void printHelp(){
3737
printf("q -> Quit\n");
3838
}
3939

40-
int main(int argc, const char* argv[])
40+
int main(int /* argc */, const char** /* argv */)
4141
{
4242
const string configuration = "{ \
4343
\"frontends\":1, \

0 commit comments

Comments
 (0)