Skip to content

Commit 76b238a

Browse files
committed
Fix MSVC compiler warnings
'return': conversion from 'uint32_t' to 'uint8_t'/'uint16_t', possible loss of data (C4244) and reg.: 'initializing': conversion from '_Ty' to '_Ty2', possible loss of data (C4244) Update midievent.h
1 parent a601bfc commit 76b238a

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/framework/midi/midievent.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ struct Event {
440440

441441
switch (messageType()) {
442442
case MessageType::ChannelVoice10: return m_data[0] & 0x7F;
443-
case MessageType::ChannelVoice20: return scaleDown(m_data[1] >> 16, 16, 7);
443+
case MessageType::ChannelVoice20: return static_cast<uint8_t>(scaleDown(m_data[1] >> 16, 16, 7));
444444
default: assert(false);
445445
}
446446
return 0;
@@ -471,7 +471,7 @@ struct Event {
471471
assertOpcode({ Opcode::NoteOn, Opcode::NoteOff });
472472

473473
switch (messageType()) {
474-
case MessageType::ChannelVoice10: return scaleUp(m_data[0] & 0x7F, 7, 16);
474+
case MessageType::ChannelVoice10: return static_cast<uint16_t>(scaleUp(m_data[0] & 0x7F, 7, 16));
475475
case MessageType::ChannelVoice20: return static_cast<uint16_t>(m_data[1] >> 16);
476476
default: assert(false);
477477
}
@@ -592,9 +592,9 @@ struct Event {
592592
{
593593
uint32_t val = data();
594594
if (messageType() == MessageType::ChannelVoice20) {
595-
return scaleDown(val, 32, 7);
595+
return static_cast<uint8_t>(scaleDown(val, 32, 7));
596596
}
597-
return val;
597+
return static_cast<uint8_t>(val);
598598
}
599599

600600
uint32_t data14() const
@@ -836,7 +836,7 @@ struct Event {
836836
//D2.3
837837
case Opcode::AssignableController:
838838
case Opcode::RegisteredController: {
839-
std::vector<std::pair<uint8_t, uint8_t> > controlChanges = {
839+
std::vector<std::pair<uint8_t, uint32_t> > controlChanges = {
840840
{ (opcode() == Opcode::RegisteredController ? 101 : 99), bank() },
841841
{ (opcode() == Opcode::RegisteredController ? 100 : 98), index() },
842842
{ 6, data() >> 25 }, // first 7 bits

0 commit comments

Comments
 (0)