add is_registered_per_note_controller_pitch_message()

midi2-dev · Oct 24, 2024 · 9187615 · 9187615
1 parent 41fea52
commit 9187615
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/inc/midi/midi2_channel_voice_message.h b/inc/midi/midi2_channel_voice_message.h
@@ -53,6 +53,7 @@ constexpr bool is_midi2_channel_voice_message(const universal_packet&);
 constexpr bool is_registered_controller_message(const universal_packet&);
 constexpr bool is_assignable_controller_message(const universal_packet&);
 constexpr bool is_registered_per_note_controller_message(const universal_packet&);
+constexpr bool is_registered_per_note_controller_pitch_message(const universal_packet&);
 constexpr bool is_assignable_per_note_controller_message(const universal_packet&);
 constexpr bool is_per_note_pitch_bend_message(const universal_packet&);
 
@@ -401,6 +402,11 @@ constexpr bool is_registered_per_note_controller_message(const universal_packet&
     return is_midi2_channel_voice_message(p) &&
            (p.status() & 0xF0) == channel_voice_status::registered_per_note_controller;
 }
+constexpr bool is_registered_per_note_controller_pitch_message(const universal_packet& p)
+{
+    return is_registered_per_note_controller_message(p) &&
+           get_per_note_controller_index(p) == registered_per_note_controller::pitch_7_25;
+}
 constexpr bool is_assignable_per_note_controller_message(const universal_packet& p)
 {
     return is_midi2_channel_voice_message(p) &&

diff --git a/tests/midi2_channel_voice_message_tests.cpp b/tests/midi2_channel_voice_message_tests.cpp
@@ -238,13 +238,24 @@ TEST_F(midi2_channel_voice_message, make_registered_per_note_controller_message)
         EXPECT_EQ((universal_packet{ 0x4F0E2C4D, 0x33445566 }), m);
         EXPECT_TRUE(is_registered_per_note_controller_message(m));
         EXPECT_TRUE(get_per_note_controller_index(m) == 77);
+        EXPECT_FALSE(is_registered_per_note_controller_pitch_message(m));
     }
 
     {
         const auto m = make_registered_per_note_controller_message(1, 5, 0x33, 0x44, controller_value{ 0x55u });
         EXPECT_EQ((universal_packet{ 0x41053344, 0x00000055 }), m);
         EXPECT_TRUE(is_registered_per_note_controller_message(m));
         EXPECT_TRUE(get_per_note_controller_index(m) == 0x44);
+        EXPECT_FALSE(is_registered_per_note_controller_pitch_message(m));
+    }
+
+    {
+        const auto m = make_registered_per_note_controller_message(
+          7, 4, 64, registered_per_note_controller::pitch_7_25, controller_value{ 0x12345678u });
+        EXPECT_EQ((universal_packet{ 0x47044003, 0x12345678u }), m);
+        EXPECT_TRUE(is_registered_per_note_controller_message(m));
+        EXPECT_TRUE(get_per_note_controller_index(m) == 3);
+        EXPECT_TRUE(is_registered_per_note_controller_pitch_message(m));
     }
 }