AudioProcessor::onmessage(): Unbox parameter on invocation

Author: uklotzde

examples/worklet.rs

@@ -143,7 +143,7 @@ impl AudioProcessor for WhiteNoiseProcessor {
         true // source node will always be active
     }
 
-    fn onmessage(&mut self, msg: &mut Box<dyn Any + Send + 'static>) {
+    fn onmessage(&mut self, msg: &mut dyn Any) {
         // handle incoming signals requesting for change of color
         if let Some(color) = msg.downcast_ref::<NoiseColor>() {
             self.color = *color;

src/node/audio_buffer_source.rs

@@ -770,7 +770,7 @@ impl AudioProcessor for AudioBufferSourceRenderer {
         true
     }
 
-    fn onmessage(&mut self, msg: &mut Box<dyn Any + Send + 'static>) {
+    fn onmessage(&mut self, msg: &mut dyn Any) {
         if let Some(control) = msg.downcast_ref::<ControlMessage>() {
             self.handle_control_message(*control);
             return;

src/node/constant_source.rs

@@ -204,7 +204,7 @@ impl AudioProcessor for ConstantSourceRenderer {
         still_running
     }
 
-    fn onmessage(&mut self, msg: &mut Box<dyn Any + Send + 'static>) {
+    fn onmessage(&mut self, msg: &mut dyn Any) {
         if let Some(schedule) = msg.downcast_ref::<Schedule>() {
             match *schedule {
                 Schedule::Start(v) => self.start_time = v,

src/node/oscillator.rs

@@ -432,7 +432,7 @@ impl AudioProcessor for OscillatorRenderer {
         true
     }
 
-    fn onmessage(&mut self, msg: &mut Box<dyn Any + Send + 'static>) {
+    fn onmessage(&mut self, msg: &mut dyn Any) {
         if let Some(&type_) = msg.downcast_ref::<OscillatorType>() {
             self.shared_type.store(type_ as u32, Ordering::Release);
             self.type_ = type_;

src/param.rs

@@ -642,7 +642,7 @@ impl AudioProcessor for AudioParamProcessor {
         true // has intrinsic value
     }
 
-    fn onmessage(&mut self, msg: &mut Box<dyn Any + Send + 'static>) {
+    fn onmessage(&mut self, msg: &mut dyn Any) {
         if let Some(automation_rate) = msg.downcast_ref::<AutomationRate>() {
             self.automation_rate = *automation_rate;
             self.shared_parts.store_automation_rate(*automation_rate);
@@ -3167,7 +3167,7 @@ mod tests {
         };
         let (param, mut render) = audio_param_pair(opts, context.mock_registration());
 
-        render.onmessage(&mut (Box::new(AutomationRate::K) as _));
+        render.onmessage(&mut AutomationRate::K);
         render.handle_incoming_event(param.set_value_at_time_raw(2., 0.000001));
 
         let vs = render.compute_intrinsic_values(0., 1., 10);
@@ -3186,7 +3186,7 @@ mod tests {
         };
         let (param, mut render) = audio_param_pair(opts, context.mock_registration());
 
-        render.onmessage(&mut (Box::new(AutomationRate::A) as _));
+        render.onmessage(&mut AutomationRate::A);
         render.handle_incoming_event(param.set_value_at_time_raw(2., 0.000001));
 
         let vs = render.compute_intrinsic_values(0., 1., 10);

src/render/graph.rs

@@ -191,7 +191,7 @@ impl Graph {
         self.nodes.get_mut(&index).unwrap().get_mut().cycle_breaker = true;
     }
 
-    pub fn route_message(&mut self, index: AudioNodeId, msg: &mut Box<dyn Any + Send + 'static>) {
+    pub fn route_message(&mut self, index: AudioNodeId, msg: &mut dyn Any) {
         self.nodes
             .get_mut(&index)
             .unwrap()

src/render/processor.rs

@@ -114,7 +114,7 @@ pub trait AudioProcessor: Send {
     /// [`MessagePort`](https://webaudio.github.io/web-audio-api/#dom-audioworkletprocessor-port)
     /// `onmessage` functionality of the AudioWorkletProcessor.
     #[allow(unused_variables)]
-    fn onmessage(&mut self, msg: &mut Box<dyn Any + Send + 'static>) {
+    fn onmessage(&mut self, msg: &mut dyn Any) {
         log::warn!("Ignoring incoming message");
     }
 }

src/render/thread.rs

@@ -123,7 +123,7 @@ impl RenderThread {
                     self.graph = Some(graph);
                 }
                 NodeMessage { id, mut msg } => {
-                    self.graph.as_mut().unwrap().route_message(id, &mut msg);
+                    self.graph.as_mut().unwrap().route_message(id, msg.as_mut());
                     // FIXME: Drop the remains of the handled message outside of the render thread.
                 }
             }