Skip to content

Commit 7d6d638

Browse files
kunitokikunitoki
committed
More tests fixes
1 parent 1abbb6c commit 7d6d638

10 files changed

+225
-225
lines changed

‎modules/yup_audio_basics/midi/ump/yup_UMPChannelVoice.h‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ constexpr bool isChannelVoiceMessageWithStatus (const UniversalPacket& p, Status
3434

3535
constexpr bool isNoteOnMessage (const UniversalPacket& p)
3636
{
37-
if (isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::note_on)))
37+
if (isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::noteOn)))
3838
{
39-
return (p.getType() == PacketType::midi2_channel_voice) || (p.getByte4() != 0);
39+
return (p.getType() == PacketType::midi2ChannelVoice) || (p.getByte4() != 0);
4040
}
4141

4242
return false;
4343
}
4444

4545
constexpr bool isNoteOffMessage (const UniversalPacket& p)
4646
{
47-
if (isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::note_off)))
47+
if (isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::noteOff)))
4848
return true;
4949

50-
return (p.getType() == PacketType::midi1_channel_voice)
51-
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::note_on))
50+
return (p.getType() == PacketType::midi1ChannelVoice)
51+
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::noteOn))
5252
&& (p.getByte4() == 0);
5353
}
5454

@@ -59,8 +59,8 @@ constexpr NoteNumber getNoteNumber (const UniversalPacket& p)
5959

6060
constexpr Pitch7_9 getNotePitch (const UniversalPacket& p)
6161
{
62-
if ((p.getType() == PacketType::midi2_channel_voice)
63-
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::note_on))
62+
if ((p.getType() == PacketType::midi2ChannelVoice)
63+
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::noteOn))
6464
&& (p.getByte4() == NoteAttribute::pitch_7_9))
6565
{
6666
return Pitch7_9 { uint16_t (p.data[1] & 0xffff) };
@@ -71,11 +71,11 @@ constexpr Pitch7_9 getNotePitch (const UniversalPacket& p)
7171

7272
constexpr Velocity getNoteVelocity (const UniversalPacket& p)
7373
{
74-
if (p.getType() == PacketType::midi2_channel_voice)
74+
if (p.getType() == PacketType::midi2ChannelVoice)
7575
return Velocity { uint16_t (p.data[1] >> 16) };
7676

77-
if ((p.getType() == PacketType::midi1_channel_voice)
78-
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::note_on))
77+
if ((p.getType() == PacketType::midi1ChannelVoice)
78+
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::noteOn))
7979
&& (p.getByte4() == 0))
8080
{
8181
return Velocity { uint7_t { 64 } };
@@ -86,7 +86,7 @@ constexpr Velocity getNoteVelocity (const UniversalPacket& p)
8686

8787
constexpr bool isPolyPressureMessage (const UniversalPacket& p)
8888
{
89-
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::poly_pressure));
89+
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::polyPressure));
9090
}
9191

9292
constexpr ControllerValue getPolyPressureValue (const UniversalPacket& p)
@@ -96,7 +96,7 @@ constexpr ControllerValue getPolyPressureValue (const UniversalPacket& p)
9696

9797
constexpr bool isControlChangeMessage (const UniversalPacket& p)
9898
{
99-
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::control_change));
99+
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::controlChange));
100100
}
101101

102102
constexpr ControllerNumber getControllerNumber (const UniversalPacket& p)
@@ -106,24 +106,24 @@ constexpr ControllerNumber getControllerNumber (const UniversalPacket& p)
106106

107107
constexpr ControllerValue getControllerValue (const UniversalPacket& p)
108108
{
109-
if (p.getType() == PacketType::midi1_channel_voice)
109+
if (p.getType() == PacketType::midi1ChannelVoice)
110110
return ControllerValue { uint7_t (p.getByte4() & 0x7f) };
111111

112112
return ControllerValue { p.data[1] };
113113
}
114114

115115
constexpr bool isProgramChangeMessage (const UniversalPacket& p)
116116
{
117-
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::program_change));
117+
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::programChange));
118118
}
119119

120120
constexpr uint7_t getProgramValue (const UniversalPacket& p)
121121
{
122122
switch (p.getType())
123123
{
124-
case PacketType::midi1_channel_voice:
124+
case PacketType::midi1ChannelVoice:
125125
return uint7_t (p.getByte3() & 0x7f);
126-
case PacketType::midi2_channel_voice:
126+
case PacketType::midi2ChannelVoice:
127127
return uint7_t ((p.data[1] >> 24u) & 0x7f);
128128
default:
129129
break;
@@ -134,25 +134,25 @@ constexpr uint7_t getProgramValue (const UniversalPacket& p)
134134

135135
constexpr bool isChannelPressureMessage (const UniversalPacket& p)
136136
{
137-
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::channel_pressure));
137+
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::channelPressure));
138138
}
139139

140140
constexpr ControllerValue getChannelPressureValue (const UniversalPacket& p)
141141
{
142-
if (p.getType() == PacketType::midi1_channel_voice)
142+
if (p.getType() == PacketType::midi1ChannelVoice)
143143
return ControllerValue { uint7_t (p.getByte3() & 0x7f) };
144144

145145
return ControllerValue { p.data[1] };
146146
}
147147

148148
constexpr bool isChannelPitchBendMessage (const UniversalPacket& p)
149149
{
150-
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::pitch_bend));
150+
return isChannelVoiceMessageWithStatus (p, Status (ChannelVoiceStatus::pitchBend));
151151
}
152152

153153
constexpr PitchBend getChannelPitchBendValue (const UniversalPacket& p)
154154
{
155-
if (p.getType() == PacketType::midi1_channel_voice)
155+
if (p.getType() == PacketType::midi1ChannelVoice)
156156
return PitchBend { uint14_t (p.getByte3() | (p.getByte4() << 7)) };
157157

158158
return PitchBend { p.data[1] };
@@ -163,11 +163,11 @@ constexpr std::optional<Midi1ChannelVoiceMessage> asMidi1ChannelVoiceMessage (co
163163
{
164164
switch (m.getStatus())
165165
{
166-
case Status (ChannelVoiceStatus::note_off):
166+
case Status (ChannelVoiceStatus::noteOff):
167167
if (m.getByte4() == 0)
168168
return makeMidi1NoteOffMessage (m.getGroup(), m.getChannel(), m.getByte3(), Velocity { uint16_t (m.getData() >> 16) });
169169
break;
170-
case Status (ChannelVoiceStatus::note_on):
170+
case Status (ChannelVoiceStatus::noteOn):
171171
if (m.getByte4() == 0)
172172
{
173173
auto vel = Velocity { uint16_t (m.getData() >> 16) };
@@ -176,9 +176,9 @@ constexpr std::optional<Midi1ChannelVoiceMessage> asMidi1ChannelVoiceMessage (co
176176
return makeMidi1NoteOnMessage (m.getGroup(), m.getChannel(), m.getByte3(), vel);
177177
}
178178
break;
179-
case Status (ChannelVoiceStatus::poly_pressure):
179+
case Status (ChannelVoiceStatus::polyPressure):
180180
return makeMidi1PolyPressureMessage (m.getGroup(), m.getChannel(), m.getByte3(), ControllerValue { m.getData() });
181-
case Status (ChannelVoiceStatus::control_change):
181+
case Status (ChannelVoiceStatus::controlChange):
182182
switch (m.getByte3())
183183
{
184184
case ControlChange::bankSelectMsb:
@@ -195,13 +195,13 @@ constexpr std::optional<Midi1ChannelVoiceMessage> asMidi1ChannelVoiceMessage (co
195195
return makeMidi1ControlChangeMessage (m.getGroup(), m.getChannel(), m.getByte3(), ControllerValue { m.getData() });
196196
}
197197
break;
198-
case Status (ChannelVoiceStatus::program_change):
198+
case Status (ChannelVoiceStatus::programChange):
199199
if ((m.getByte4() & 0x1) == 0)
200200
return makeMidi1ProgramChangeMessage (m.getGroup(), m.getChannel(), uint7_t (m.getData() >> 24));
201201
break;
202-
case Status (ChannelVoiceStatus::channel_pressure):
202+
case Status (ChannelVoiceStatus::channelPressure):
203203
return makeMidi1ChannelPressureMessage (m.getGroup(), m.getChannel(), ControllerValue { m.getData() });
204-
case Status (ChannelVoiceStatus::pitch_bend):
204+
case Status (ChannelVoiceStatus::pitchBend):
205205
return makeMidi1PitchBendMessage (m.getGroup(), m.getChannel(), PitchBend { m.getData() });
206206
default:
207207
break;
@@ -214,15 +214,15 @@ constexpr std::optional<Midi2ChannelVoiceMessage> asMidi2ChannelVoiceMessage (co
214214
{
215215
switch (m.getStatus())
216216
{
217-
case Status (ChannelVoiceStatus::note_off):
217+
case Status (ChannelVoiceStatus::noteOff):
218218
return makeMidi2NoteOffMessage (m.getGroup(), m.getChannel(), m.getDataByte1(), Velocity { m.getDataByte2() });
219-
case Status (ChannelVoiceStatus::note_on):
219+
case Status (ChannelVoiceStatus::noteOn):
220220
if (m.getDataByte2() == 0)
221221
return makeMidi2NoteOffMessage (m.getGroup(), m.getChannel(), m.getDataByte1(), Velocity { uint7_t { 64 } });
222222
return makeMidi2NoteOnMessage (m.getGroup(), m.getChannel(), m.getDataByte1(), Velocity { m.getDataByte2() });
223-
case Status (ChannelVoiceStatus::poly_pressure):
223+
case Status (ChannelVoiceStatus::polyPressure):
224224
return makeMidi2PolyPressureMessage (m.getGroup(), m.getChannel(), m.getDataByte1(), ControllerValue { m.getDataByte2() });
225-
case Status (ChannelVoiceStatus::control_change):
225+
case Status (ChannelVoiceStatus::controlChange):
226226
switch (m.getDataByte1())
227227
{
228228
case ControlChange::bankSelectMsb:
@@ -239,11 +239,11 @@ constexpr std::optional<Midi2ChannelVoiceMessage> asMidi2ChannelVoiceMessage (co
239239
return makeMidi2ControlChangeMessage (m.getGroup(), m.getChannel(), m.getDataByte1(), ControllerValue { m.getDataByte2() });
240240
}
241241
break;
242-
case Status (ChannelVoiceStatus::program_change):
242+
case Status (ChannelVoiceStatus::programChange):
243243
return makeMidi2ProgramChangeMessage (m.getGroup(), m.getChannel(), m.getDataByte1());
244-
case Status (ChannelVoiceStatus::channel_pressure):
244+
case Status (ChannelVoiceStatus::channelPressure):
245245
return makeMidi2ChannelPressureMessage (m.getGroup(), m.getChannel(), ControllerValue { m.getDataByte1() });
246-
case Status (ChannelVoiceStatus::pitch_bend):
246+
case Status (ChannelVoiceStatus::pitchBend):
247247
return makeMidi2PitchBendMessage (m.getGroup(), m.getChannel(), PitchBend { m.get14BitValue() });
248248
default:
249249
break;
@@ -256,19 +256,19 @@ constexpr std::optional<Midi2ChannelVoiceMessage> asMidi2ChannelVoiceMessage (co
256256
constexpr bool isRegisteredControllerMessage (const UniversalPacket& p)
257257
{
258258
return isMidi2ChannelVoiceMessage (p)
259-
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::registered_controller);
259+
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::registeredController);
260260
}
261261

262262
constexpr bool isAssignableControllerMessage (const UniversalPacket& p)
263263
{
264264
return isMidi2ChannelVoiceMessage (p)
265-
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::assignable_controller);
265+
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::assignableController);
266266
}
267267

268268
constexpr bool isRegisteredPerNoteControllerMessage (const UniversalPacket& p)
269269
{
270270
return isMidi2ChannelVoiceMessage (p)
271-
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::registered_per_note_controller);
271+
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::registeredPerNoteController);
272272
}
273273

274274
constexpr bool isRegisteredPerNoteControllerPitchMessage (const UniversalPacket& p)
@@ -280,26 +280,26 @@ constexpr bool isRegisteredPerNoteControllerPitchMessage (const UniversalPacket&
280280
constexpr bool isAssignablePerNoteControllerMessage (const UniversalPacket& p)
281281
{
282282
return isMidi2ChannelVoiceMessage (p)
283-
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::assignable_per_note_controller);
283+
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::assignablePerNoteController);
284284
}
285285

286286
constexpr bool isPerNotePitchBendMessage (const UniversalPacket& p)
287287
{
288288
return isMidi2ChannelVoiceMessage (p)
289-
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::per_note_pitch_bend);
289+
&& (p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::perNotePitchBend);
290290
}
291291

292292
constexpr bool isNoteOnWithAttribute (const UniversalPacket& p, uint8_t attribute)
293293
{
294294
return isMidi2ChannelVoiceMessage (p)
295-
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::note_on))
295+
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::noteOn))
296296
&& (p.getByte4() == attribute);
297297
}
298298

299299
constexpr bool isNoteOffWithAttribute (const UniversalPacket& p, uint8_t attribute)
300300
{
301301
return isMidi2ChannelVoiceMessage (p)
302-
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::note_off))
302+
&& ((p.getStatus() & 0xf0) == uint8_t (ChannelVoiceStatus::noteOff))
303303
&& (p.getByte4() == attribute);
304304
}
305305

‎modules/yup_audio_basics/midi/ump/yup_UMPDataMessages.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ constexpr bool isDataMessage (const UniversalPacket& p)
7878
constexpr bool isSysEx7Packet (const UniversalPacket& p)
7979
{
8080
return isDataMessage (p)
81-
&& ((p.getStatus() & 0xf0) <= Status (DataStatus::sysex7_end))
81+
&& ((p.getStatus() & 0xf0) <= Status (DataStatus::sysex7End))
8282
&& ((p.getStatus() & 0x0f) <= 6);
8383
}
8484

@@ -114,22 +114,22 @@ constexpr std::optional<SysEx7PacketView> asSysEx7PacketView (const UniversalPac
114114

115115
constexpr SysEx7Packet makeSysEx7CompletePacket (Group group = 0)
116116
{
117-
return SysEx7Packet { Status (DataStatus::sysex7_complete), group };
117+
return SysEx7Packet { Status (DataStatus::sysex7Complete), group };
118118
}
119119

120120
constexpr SysEx7Packet makeSysEx7StartPacket (Group group = 0)
121121
{
122-
return SysEx7Packet { Status (DataStatus::sysex7_start), group };
122+
return SysEx7Packet { Status (DataStatus::sysex7Start), group };
123123
}
124124

125125
constexpr SysEx7Packet makeSysEx7ContinuePacket (Group group = 0)
126126
{
127-
return SysEx7Packet { Status (DataStatus::sysex7_continue), group };
127+
return SysEx7Packet { Status (DataStatus::sysex7Continue), group };
128128
}
129129

130130
constexpr SysEx7Packet makeSysEx7EndPacket (Group group = 0)
131131
{
132-
return SysEx7Packet { Status (DataStatus::sysex7_end), group };
132+
return SysEx7Packet { Status (DataStatus::sysex7End), group };
133133
}
134134

135135
} // namespace yup::ump

‎modules/yup_audio_basics/midi/ump/yup_UMPExtendedDataMessages.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,13 @@ struct SysEx8Packet : ExtendedDataMessage
8282

8383
constexpr bool isExtendedDataMessage (const UniversalPacket& p)
8484
{
85-
return p.getType() == PacketType::extended_data;
85+
return p.getType() == PacketType::extendedData;
8686
}
8787

8888
constexpr bool isSysEx8Packet (const UniversalPacket& p)
8989
{
9090
return isExtendedDataMessage (p)
91-
&& ((p.getStatus() & 0xf0) <= Status (ExtendedDataStatus::sysex8_end))
91+
&& ((p.getStatus() & 0xf0) <= Status (ExtendedDataStatus::sysex8End))
9292
&& ((p.getStatus() & 0x0f) > 0)
9393
&& ((p.getStatus() & 0x0f) <= 14);
9494
}
@@ -129,22 +129,22 @@ constexpr std::optional<SysEx8PacketView> asSysEx8PacketView (const UniversalPac
129129

130130
constexpr SysEx8Packet makeSysEx8CompletePacket (uint8_t streamId, Group group = 0)
131131
{
132-
return SysEx8Packet { Status (ExtendedDataStatus::sysex8_complete), streamId, group };
132+
return SysEx8Packet { Status (ExtendedDataStatus::sysex8Complete), streamId, group };
133133
}
134134

135135
constexpr SysEx8Packet makeSysEx8StartPacket (uint8_t streamId, Group group = 0)
136136
{
137-
return SysEx8Packet { Status (ExtendedDataStatus::sysex8_start), streamId, group };
137+
return SysEx8Packet { Status (ExtendedDataStatus::sysex8Start), streamId, group };
138138
}
139139

140140
constexpr SysEx8Packet makeSysEx8ContinuePacket (uint8_t streamId, Group group = 0)
141141
{
142-
return SysEx8Packet { Status (ExtendedDataStatus::sysex8_continue), streamId, group };
142+
return SysEx8Packet { Status (ExtendedDataStatus::sysex8Continue), streamId, group };
143143
}
144144

145145
constexpr SysEx8Packet makeSysEx8EndPacket (uint8_t streamId, Group group = 0)
146146
{
147-
return SysEx8Packet { Status (ExtendedDataStatus::sysex8_end), streamId, group };
147+
return SysEx8Packet { Status (ExtendedDataStatus::sysex8End), streamId, group };
148148
}
149149

150150
} // namespace yup::ump

‎modules/yup_audio_basics/midi/ump/yup_UMPFlexDataMessages.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ struct FlexDataMessage : UniversalPacket
8585

8686
constexpr bool isFlexDataMessage (const UniversalPacket& p)
8787
{
88-
return p.getType() == PacketType::flex_data;
88+
return p.getType() == PacketType::flexData;
8989
}
9090

9191
struct FlexDataMessageView
9292
{
9393
constexpr explicit FlexDataMessageView (const UniversalPacket& ump)
9494
: p (ump)
9595
{
96-
jassert (p.getType() == PacketType::flex_data);
96+
jassert (p.getType() == PacketType::flexData);
9797
}
9898

9999
constexpr Group getGroup() const { return p.getGroup(); }

0 commit comments

Comments
 (0)