add convinience conversions between controller_value and pitch_7_25

inc/midi/types.h

@@ -156,6 +156,10 @@ struct pitch_7_9
 
 //--------------------------------------------------------------------------
 
+struct controller_value;
+
+//--------------------------------------------------------------------------
+
 struct pitch_7_25
 {
     uint32_t value{ 0 };
@@ -164,6 +168,7 @@ struct pitch_7_25
     constexpr explicit pitch_7_25(uint32_t);
     constexpr explicit pitch_7_25(pitch_7_9);
     constexpr explicit pitch_7_25(note_nr_t);
+    constexpr explicit pitch_7_25(const controller_value&);
     constexpr explicit pitch_7_25(float);
     constexpr explicit pitch_7_25(double);
 
@@ -216,6 +221,7 @@ struct controller_value
     constexpr explicit controller_value(uint32_t);
     constexpr explicit controller_value(uint14_t);
     constexpr explicit controller_value(uint7_t);
+    constexpr explicit controller_value(const pitch_7_25&);
     constexpr explicit controller_value(float);
     constexpr explicit controller_value(double);
 
@@ -352,6 +358,10 @@ constexpr pitch_7_25::pitch_7_25(pitch_7_9 p)
 {
     this->operator=(p);
 }
+constexpr pitch_7_25::pitch_7_25(const controller_value& v)
+  : value(v.value)
+{
+}
 
 constexpr note_nr_t pitch_7_25::note_nr() const
 {
@@ -401,6 +411,11 @@ constexpr controller_value::controller_value(uint7_t v)
   : value(upsample_7_to_32bit(v))
 {
 }
+constexpr controller_value::controller_value(const pitch_7_25& p)
+  : value(p.value)
+{
+}
+
 constexpr uint14_t controller_value::as_uint14() const
 {
     return downsample_32_to_14bit(value);

tests/type_tests.cpp

@@ -1422,6 +1422,19 @@ TEST(pitch_7_25, construct_from_pitch7_9)
 
 //-----------------------------------------------
 
+TEST(pitch_7_25, construct_from_controller_value)
+{
+    using namespace midi;
+
+    {
+        pitch_7_25 p{ controller_value{ 0x12345678u } };
+
+        EXPECT_EQ(0x12345678u, p.value);
+    }
+}
+
+//-----------------------------------------------
+
 TEST(pitch_7_25, construct_from_float)
 {
     using namespace midi;
@@ -2060,6 +2073,20 @@ TEST(controller_value, construct_from_uint7)
 
 //-----------------------------------------------
 
+TEST(controller_value, construct_from_pitch_7_25)
+{
+    using namespace midi;
+
+    {
+        pitch_7_25 p{ 74.63 };
+        controller_value v{ p };
+
+        EXPECT_EQ(p.value, v.value);
+    }
+}
+
+//-----------------------------------------------
+
 TEST(controller_value, construct_from_float)
 {
     using namespace midi;