Skip to content

Commit f1d5be4

Browse files
author
Franz Detro
committed
add data_byte accessors to flex_data_message_view
1 parent 4996112 commit f1d5be4

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

inc/midi/flex_data_message.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,18 @@ struct flex_data_message_view
7979
constexpr uint32_t data1() const { return p.data[1]; }
8080
constexpr uint32_t data2() const { return p.data[2]; }
8181
constexpr uint32_t data3() const { return p.data[3]; }
82+
constexpr uint8_t data_byte1() const { return p.get_byte(4); }
83+
constexpr uint8_t data_byte2() const { return p.get_byte(5); }
84+
constexpr uint8_t data_byte3() const { return p.get_byte(6); }
85+
constexpr uint8_t data_byte4() const { return p.get_byte(7); }
86+
constexpr uint8_t data_byte5() const { return p.get_byte(8); }
87+
constexpr uint8_t data_byte6() const { return p.get_byte(9); }
88+
constexpr uint8_t data_byte7() const { return p.get_byte(10); }
89+
constexpr uint8_t data_byte8() const { return p.get_byte(11); }
90+
constexpr uint8_t data_byte9() const { return p.get_byte(12); }
91+
constexpr uint8_t data_byte10() const { return p.get_byte(13); }
92+
constexpr uint8_t data_byte11() const { return p.get_byte(14); }
93+
constexpr uint8_t data_byte12() const { return p.get_byte(15); }
8294

8395
const std::string payload_as_string() const { return flex_data_message::payload_as_string(p); }
8496

tests/flex_data_message_tests.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,18 @@ TEST_F(flex_data_message, flex_data_message_view)
139139
EXPECT_EQ(0x12345678u, v.data1());
140140
EXPECT_EQ(0x9ABCDEF0u, v.data2());
141141
EXPECT_EQ(0xA9876543u, v.data3());
142+
EXPECT_EQ(0x12u, v.data_byte1());
143+
EXPECT_EQ(0x34u, v.data_byte2());
144+
EXPECT_EQ(0x56u, v.data_byte3());
145+
EXPECT_EQ(0x78u, v.data_byte4());
146+
EXPECT_EQ(0x9Au, v.data_byte5());
147+
EXPECT_EQ(0xBCu, v.data_byte6());
148+
EXPECT_EQ(0xDEu, v.data_byte7());
149+
EXPECT_EQ(0xF0u, v.data_byte8());
150+
EXPECT_EQ(0xA9u, v.data_byte9());
151+
EXPECT_EQ(0x87u, v.data_byte10());
152+
EXPECT_EQ(0x65u, v.data_byte11());
153+
EXPECT_EQ(0x43u, v.data_byte12());
142154
}
143155

144156
{
@@ -157,6 +169,9 @@ TEST_F(flex_data_message, flex_data_message_view)
157169
EXPECT_EQ(0xAu, v.data1());
158170
EXPECT_EQ(0xBu, v.data2());
159171
EXPECT_EQ(0xCu, v.data3());
172+
EXPECT_EQ(0xAu, v.data_byte4());
173+
EXPECT_EQ(0xBu, v.data_byte8());
174+
EXPECT_EQ(0xCu, v.data_byte12());
160175
}
161176

162177
{
@@ -175,6 +190,9 @@ TEST_F(flex_data_message, flex_data_message_view)
175190
EXPECT_EQ(7u, v.data1());
176191
EXPECT_EQ(8u, v.data2());
177192
EXPECT_EQ(9u, v.data3());
193+
EXPECT_EQ(7u, v.data_byte4());
194+
EXPECT_EQ(8u, v.data_byte8());
195+
EXPECT_EQ(9u, v.data_byte12());
178196
}
179197

180198
{

0 commit comments

Comments
 (0)