Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-10 16:05:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use new params impl (#4)

Browse source 
* AudioNodeType -> AudioNodeInit

* Use new param type system, clean up
This commit is contained in:
Manish Goregaokar 2018-07-09 23:10:20 -07:00 • committed by Fernando Jiménez Moreno
parent 8f9a081ff0
commit f0d04249f9
9 changed files with 113 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

101
components/script/dom/audioparam.rs
View file

@ -2,31 +2,27 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use dom::baseaudiocontext::BaseAudioContext;
use dom::bindings::codegen::Bindings::AudioParamBinding;
use dom::bindings::codegen::Bindings::AudioParamBinding::{AudioParamMethods, AutomationRate};
use dom::bindings::num::Finite;
use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::bindings::root::DomRoot;
use dom::bindings::trace::JSTraceable;
use dom::bindings::root::{Dom, DomRoot};
use dom::window::Window;
use dom_struct::dom_struct;
use malloc_size_of::MallocSizeOf;
use servo_media::audio::param::RampKind;
use servo_media::audio::graph::NodeId;
use servo_media::audio::node::AudioNodeMessage;
use servo_media::audio::param::{ParamType, RampKind, UserAutomationEvent};
use std::cell::Cell;
pub trait AudioParamImpl: JSTraceable + MallocSizeOf {
fn set_value(&self, value: f32);
fn set_value_at_time(&self, value: f32, start_time: f64);
fn ramp_to_value_at_time(&self, ramp_kind: RampKind, value: f32, end_time: f64);
fn set_target_at_time(&self, value: f32, start_time: f64, time_constant: f32);
fn cancel_scheduled_values(&self, cancel_time: f64);
fn cancel_and_hold_at_time(&self, cancel_time: f64);
}
#[dom_struct]
pub struct AudioParam {
reflector_: Reflector,
param_impl: Box<AudioParamImpl>,
context: Dom<BaseAudioContext>,
#[ignore_malloc_size_of = "servo_media"]
node: NodeId,
#[ignore_malloc_size_of = "servo_media"]
param: ParamType,
automation_rate: Cell<AutomationRate>,
default_value: f32,
min_value: f32,
@ -34,14 +30,18 @@ pub struct AudioParam {
}
impl AudioParam {
pub fn new_inherited(param_impl: Box<AudioParamImpl>,
pub fn new_inherited(context: &BaseAudioContext,
node: NodeId,
param: ParamType,
automation_rate: AutomationRate,
default_value: f32,
min_value: f32,
max_value: f32) -> AudioParam {
AudioParam {
reflector_: Reflector::new(),
param_impl,
context: Dom::from_ref(context),
node,
param,
automation_rate: Cell::new(automation_rate),
default_value,
min_value,
@ -51,12 +51,14 @@ impl AudioParam {
#[allow(unrooted_must_root)]
pub fn new(window: &Window,
param_impl: Box<AudioParamImpl>,
context: &BaseAudioContext,
node: NodeId,
param: ParamType,
automation_rate: AutomationRate,
default_value: f32,
min_value: f32,
max_value: f32) -> DomRoot<AudioParam> {
let audio_param = AudioParam::new_inherited(param_impl, automation_rate,
let audio_param = AudioParam::new_inherited(context, node, param, automation_rate,
default_value, min_value, max_value);
reflect_dom_object(Box::new(audio_param), window, AudioParamBinding::Wrap)
}
@ -78,7 +80,14 @@ impl AudioParamMethods for AudioParam {
}
fn SetValue(&self, value: Finite<f32>) {
self.param_impl.set_value(*value);
self.context.audio_context_impl()
.message_node(self.node,
AudioNodeMessage::SetParam(self.param,
UserAutomationEvent::SetValue(
*value
)
)
);
}
fn DefaultValue(&self) -> Finite<f32> {
@ -96,38 +105,80 @@ impl AudioParamMethods for AudioParam {
fn SetValueAtTime(&self, value: Finite<f32>, start_time: Finite<f64>)
-> DomRoot<AudioParam>
{
self.param_impl.set_value_at_time(*value, *start_time);
self.context.audio_context_impl()
.message_node(self.node,
AudioNodeMessage::SetParam(self.param,
UserAutomationEvent::SetValueAtTime(
*value, *start_time
)
)
);
DomRoot::from_ref(self)
}
fn LinearRampToValueAtTime(&self, value: Finite<f32>, end_time: Finite<f64>)
-> DomRoot<AudioParam>
{
self.param_impl.ramp_to_value_at_time(RampKind::Linear, *value, *end_time);
self.context.audio_context_impl()
.message_node(self.node,
AudioNodeMessage::SetParam(self.param,
UserAutomationEvent::RampToValueAtTime(
RampKind::Linear, *value, *end_time
)
)
);
DomRoot::from_ref(self)
}
fn ExponentialRampToValueAtTime(&self, value: Finite<f32>, end_time: Finite<f64>)
-> DomRoot<AudioParam>
{
self.param_impl.ramp_to_value_at_time(RampKind::Exponential, *value, *end_time);
self.context.audio_context_impl()
.message_node(self.node,
AudioNodeMessage::SetParam(self.param,
UserAutomationEvent::RampToValueAtTime(
RampKind::Exponential, *value, *end_time
)
)
);
DomRoot::from_ref(self)
}
fn SetTargetAtTime(&self, target: Finite<f32>, start_time: Finite<f64>, time_constant: Finite<f32>)
-> DomRoot<AudioParam>
{
self.param_impl.set_target_at_time(*target, *start_time, *time_constant);
self.context.audio_context_impl()
.message_node(self.node,
AudioNodeMessage::SetParam(self.param,
UserAutomationEvent::SetTargetAtTime(
*target, *start_time, (*time_constant).into()
)
)
);
DomRoot::from_ref(self)
}
fn CancelScheduledValues(&self, cancel_time: Finite<f64>) -> DomRoot<AudioParam> {
self.param_impl.cancel_scheduled_values(*cancel_time);
self.context.audio_context_impl()
.message_node(self.node,
AudioNodeMessage::SetParam(self.param,
UserAutomationEvent::CancelScheduledValues(
*cancel_time
)
)
);
DomRoot::from_ref(self)
}
fn CancelAndHoldAtTime(&self, cancel_time: Finite<f64>) -> DomRoot<AudioParam> {
self.param_impl.cancel_and_hold_at_time(*cancel_time);
self.context.audio_context_impl()
.message_node(self.node,
AudioNodeMessage::SetParam(self.param,
UserAutomationEvent::CancelAndHoldAtTime(
*cancel_time
)
)
);
DomRoot::from_ref(self)
}
}