use custom errors in VmcExtBlendVal
This commit is contained in:
		
							parent
							
								
									9bcfdeec81
								
							
						
					
					
						commit
						c88dc87e50
					
				| 
						 | 
					@ -362,19 +362,19 @@ impl MessageBehavior for VmcExtBlendVal {
 | 
				
			||||||
            ],
 | 
					            ],
 | 
				
			||||||
        };
 | 
					        };
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    fn from_osc_message(msg: OscMessage) -> Result<Self, String> {
 | 
					    fn from_osc_message(msg: OscMessage) -> Result<Self, FromMessageErr> {
 | 
				
			||||||
        let name: String;
 | 
					        let name: String;
 | 
				
			||||||
        let value: f32;
 | 
					        let value: f32;
 | 
				
			||||||
        if msg.args.len() != 2 {
 | 
					        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}));
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        match &msg.args[0] {
 | 
					        match &msg.args[0] {
 | 
				
			||||||
            OscType::String(s) => name = s.to_owned(),
 | 
					            OscType::String(s) => name = s.to_owned(),
 | 
				
			||||||
            _ => return Err(String::from("arg type invalid")),
 | 
					            _ => return Err(FromMessageErr::ArgType(ArgTypeErr { expected: OscType::String(String::new()), actual: msg.args[0], addr: msg.addr, arg_count: 0})),
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        match msg.args[1] {
 | 
					        match msg.args[1] {
 | 
				
			||||||
            OscType::Float(f) => value = f,
 | 
					            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(VmcExtBlendVal { name, value });
 | 
					        return Ok(VmcExtBlendVal { name, value });
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user