Skip to content

Commit 7992cc6

Browse files
JeromeMartinezJeromeMartinez
authored
Merge pull request #865 from MediaArea/xcode
Fix build with Xcode 16.3+
2 parents 4b8decb + 60e4c87 commit 7992cc6

File tree

4 files changed

+47
-46
lines changed

4 files changed

+47
-46
lines changed

‎Project/QtCreator/qctools-lib/qctools-lib.pro‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ QT = core network multimedia concurrent
22

33
TARGET = qctools
44
TEMPLATE = lib
5-
CONFIG += c++1z
5+
macx:CONFIG += c++20
6+
else:CONFIG += c++1z
67
CONFIG += staticlib
78

89

‎Source/Core/AudioCore.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -92,23 +92,23 @@ struct per_group AudioPerGroup [Group_AudioMax]=
9292
const struct per_item AudioPerItem [Item_AudioMax]=
9393
{
9494
//Y
95-
{ Group_R128, Group_AudioMax, "EBU R128 Momentary\nloudness","lavfi.r128.M", 3, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_EbuR128, nullptr, -1 },
96-
{ Group_aphasemeter, Group_AudioMax, "Audio Phase", "lavfi.aphasemeter.phase", 3, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_aphasemeter, nullptr, -1 },
97-
{ Group_astats_dc, Group_AudioMax, "Audio DC Offset", "lavfi.astats.Overall.DC_offset", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
98-
{ Group_astats_levels,Group_AudioMax, "Audio Min Level", "lavfi.astats.Overall.Min_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
99-
{ Group_astats_levels,Group_AudioMax, "Audio Max Level", "lavfi.astats.Overall.Max_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
100-
{ Group_astats_lvlchs,Group_AudioMax, "Audio Min Level (Ch2)", "lavfi.astats.2.Min_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
101-
{ Group_astats_lvlchs,Group_AudioMax, "Audio Max Level (Ch2)", "lavfi.astats.2.Max_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
102-
{ Group_astats_lvlchs,Group_AudioMax, "Audio Min Level (Ch1)", "lavfi.astats.1.Min_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
103-
{ Group_astats_lvlchs,Group_AudioMax, "Audio Max Level (Ch1)", "lavfi.astats.1.Max_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
104-
{ Group_astats_zeros, Group_AudioMax, "Audio Zero\nCrossing (ch 2)", "lavfi.astats.2.Zero_crossings_rate", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
105-
{ Group_astats_zeros, Group_AudioMax, "Audio Zero\nCrossing (ch 1)", "lavfi.astats.1.Zero_crossings_rate", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
106-
{ Group_adif, Group_AudioMax, "Difference Min", "lavfi.astats.Overall.Min_difference", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
107-
{ Group_adif, Group_AudioMax, "Difference Max", "lavfi.astats.Overall.Max_difference", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
108-
{ Group_adif, Group_AudioMax, "Difference Mean", "lavfi.astats.Overall.Mean_difference", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
109-
{ Group_astats_RMS, Group_AudioMax, "Peak Level", "lavfi.astats.Overall.Peak_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
110-
{ Group_astats_RMS, Group_AudioMax, "RMS Peak", "lavfi.astats.Overall.RMS_peak", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
111-
{ Group_astats_RMS, Group_AudioMax, "RMS Trough", "lavfi.astats.Overall.RMS_trough", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1 },
95+
{ Group_R128, Group_AudioMax, "EBU R128 Momentary\nloudness","lavfi.r128.M", 3, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_EbuR128, nullptr, -1, nullptr },
96+
{ Group_aphasemeter, Group_AudioMax, "Audio Phase", "lavfi.aphasemeter.phase", 3, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_aphasemeter, nullptr, -1, nullptr },
97+
{ Group_astats_dc, Group_AudioMax, "Audio DC Offset", "lavfi.astats.Overall.DC_offset", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
98+
{ Group_astats_levels,Group_AudioMax, "Audio Min Level", "lavfi.astats.Overall.Min_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
99+
{ Group_astats_levels,Group_AudioMax, "Audio Max Level", "lavfi.astats.Overall.Max_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
100+
{ Group_astats_lvlchs,Group_AudioMax, "Audio Min Level (Ch2)", "lavfi.astats.2.Min_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
101+
{ Group_astats_lvlchs,Group_AudioMax, "Audio Max Level (Ch2)", "lavfi.astats.2.Max_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
102+
{ Group_astats_lvlchs,Group_AudioMax, "Audio Min Level (Ch1)", "lavfi.astats.1.Min_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
103+
{ Group_astats_lvlchs,Group_AudioMax, "Audio Max Level (Ch1)", "lavfi.astats.1.Max_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
104+
{ Group_astats_zeros, Group_AudioMax, "Audio Zero\nCrossing (ch 2)", "lavfi.astats.2.Zero_crossings_rate", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
105+
{ Group_astats_zeros, Group_AudioMax, "Audio Zero\nCrossing (ch 1)", "lavfi.astats.1.Zero_crossings_rate", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
106+
{ Group_adif, Group_AudioMax, "Difference Min", "lavfi.astats.Overall.Min_difference", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
107+
{ Group_adif, Group_AudioMax, "Difference Max", "lavfi.astats.Overall.Max_difference", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
108+
{ Group_adif, Group_AudioMax, "Difference Mean", "lavfi.astats.Overall.Mean_difference", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
109+
{ Group_astats_RMS, Group_AudioMax, "Peak Level", "lavfi.astats.Overall.Peak_level", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
110+
{ Group_astats_RMS, Group_AudioMax, "RMS Peak", "lavfi.astats.Overall.RMS_peak", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
111+
{ Group_astats_RMS, Group_AudioMax, "RMS Trough", "lavfi.astats.Overall.RMS_trough", 6, false, DBL_MAX, DBL_MAX, ActiveFilter_Audio_astats, nullptr, -1, nullptr },
112112
//{ Group_R128, Group_AudioMax, "R128.S", "lavfi.r128.S", 0, false, DBL_MAX, DBL_MAX },
113113
//{ Group_R128, Group_AudioMax, "R128.I", "lavfi.r128.I", 0, true, DBL_MAX, DBL_MAX },
114114
//U

‎Source/Core/Core.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct per_item
6666
const activefilter Filter;
6767
const char* color;
6868
const int thickness;
69-
const char* fillInfo { nullptr };
69+
const char* fillInfo;
7070
};
7171

7272
struct stream_info

0 commit comments

Comments
 (0)