From 75a541cc2a536b45bd53b7eda111e662a35ac238 Mon Sep 17 00:00:00 2001 From: Cassandra de la Cruz-Munoz Date: Sun, 31 Dec 2023 12:00:52 -0500 Subject: [PATCH] use custom errors in VmcExtMidiCcVal --- src/lib.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index ad76f18..ce125a5 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -671,19 +671,19 @@ impl MessageBehavior for VmcExtMidiCcVal { args: vec![OscType::from(self.knob), OscType::from(self.value)], }; } - fn from_osc_message(msg: OscMessage) -> Result { + fn from_osc_message(msg: OscMessage) -> Result { if msg.args.len() != 2 { - return Err(String::from("arg count invalid")); + return Err(FromMessageErr::ArgCount(ArgCountErr { expected_in: vec![2], actual: msg.args.len(), addr: msg.addr})); } let knob: i32; let value: f32; match msg.args[0] { OscType::Int(i) => knob = i, - _ => return Err(String::from("arg type invalid")), + _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Int(0), actual: msg.args[0], addr: msg.addr, arg_count: 0})), } match msg.args[1] { OscType::Float(f) => value = f, - _ => return Err(String::from("arg type invalid")), + _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::Float(0.0), actual: msg.args[1], addr: msg.addr, arg_count: 1})), } return Ok(VmcExtMidiCcVal { knob, value }); }