Periodic wave using vectors

audio/src/oscillator_node.rs

@@ -4,12 +4,39 @@ use node::{AudioNodeType, ChannelInfo, ShouldPlay};
 use num_traits::cast::NumCast;
 use param::{Param, ParamType};
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Clone, Debug)]
+pub struct PeriodicWaveConstraints {
+    pub disable_normalization: bool,
+}
+impl Default for PeriodicWaveConstraints{
+	fn default()->Self{
+		PeriodicWaveConstraints{
+			disable_normalization: false,
+		}
+	}
+}
+
+
+
+#[derive(Clone, Debug)]
 pub struct PeriodicWaveOptions {
     // XXX https://webaudio.github.io/web-audio-api/#dictdef-periodicwaveoptions
 }
 
-#[derive(Copy, Clone, Debug)]
+/*
+impl Default for PeriodicWaveOptions {
+    fn default() -> Self {
+        PeriodicWaveOptions {
+            impl Default for PeriodicWaveOptions {
+
+        }
+    }
+}
+Implement the constructor and initialize the values for the vectors based on the conditions
+
+*/
+
+#[derive(Clone, Debug)]
 pub enum OscillatorType {
     Sine,
     Square,
@@ -18,7 +45,7 @@ pub enum OscillatorType {
     Custom,
 }
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Clone, Debug)]
 pub struct OscillatorNodeOptions {
     pub oscillator_type: OscillatorType,
     pub freq: f32,

examples/biquad.rs

@@ -15,13 +15,13 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     let dest = context.dest_node();
     let mut options = OscillatorNodeOptions::default();
     options.freq = 100.;
-    let osc1 = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    let osc1 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
     options.freq = 800.;
-    let osc2 = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    let osc2 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
     let mut options = BiquadFilterNodeOptions::default();
     options.frequency = 50.;
     options.filter = FilterType::LowPass;
-    let biquad = context.create_node(AudioNodeInit::BiquadFilterNode(options), Default::default());
+    let biquad = context.create_node(AudioNodeInit::BiquadFilterNode(options.clone()), Default::default());
     context.connect_ports(osc1.output(0), biquad.input(0));
     context.connect_ports(osc2.output(0), biquad.input(0));
     context.connect_ports(biquad.output(0), dest.input(0));

examples/channels.rs

@@ -2,20 +2,21 @@ extern crate servo_media;
 
 use servo_media::audio::channel_node::ChannelNodeOptions;
 use servo_media::audio::gain_node::GainNodeOptions;
+use servo_media::audio::oscillator_node::OscillatorNodeOptions;
 use servo_media::audio::node::{AudioNodeInit, AudioNodeMessage, AudioScheduledSourceNodeMessage};
 use servo_media::ServoMedia;
 use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
     let context = servo_media.create_audio_context(Default::default());
-    let mut options = Default::default();
-    let osc = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    let mut options = OscillatorNodeOptions::default();
+    let osc = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
     options.freq = 213.;
-    let osc2 = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    let osc2 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
     let mut options = GainNodeOptions::default();
     options.gain = 0.7;
-    let gain = context.create_node(AudioNodeInit::GainNode(options), Default::default());
+    let gain = context.create_node(AudioNodeInit::GainNode(options.clone()), Default::default());
     let options = ChannelNodeOptions { channels: 2 };
     let merger = context.create_node(
         AudioNodeInit::ChannelMergerNode(options),

examples/channelsum.rs

@@ -2,22 +2,23 @@ extern crate servo_media;
 
 use servo_media::audio::channel_node::ChannelNodeOptions;
 use servo_media::audio::gain_node::GainNodeOptions;
+use servo_media::audio::oscillator_node::OscillatorNodeOptions;
 use servo_media::audio::node::{AudioNodeInit, AudioNodeMessage, AudioScheduledSourceNodeMessage};
 use servo_media::ServoMedia;
 use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
     let context = servo_media.create_audio_context(Default::default());
-    let mut options = Default::default();
-    let osc = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    let mut options = OscillatorNodeOptions::default();
+    let osc = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
     options.freq = 213.;
-    let osc2 = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    let osc2 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
     options.freq = 100.;
-    let osc3 = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    let osc3 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
     let mut options = GainNodeOptions::default();
     options.gain = 0.7;
-    let gain = context.create_node(AudioNodeInit::GainNode(options), Default::default());
+    let gain = context.create_node(AudioNodeInit::GainNode(options.clone()), Default::default());
 
     let options = ChannelNodeOptions { channels: 2 };
     let merger = context.create_node(

examples/oscillator.rs

@@ -15,7 +15,7 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     let context = servo_media.create_audio_context(Default::default());
     let dest = context.dest_node();
     let mut options = OscillatorNodeOptions::default();
-    let osc1 = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    let osc1 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
     context.connect_ports(osc1.output(0), dest.input(0));
     let _ = context.resume();
     context.message_node(
@@ -30,7 +30,7 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     options.oscillator_type = Square;
     let context = servo_media.create_audio_context(Default::default());
     let dest = context.dest_node();
-    let osc2 = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    let osc2 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
     context.connect_ports(osc2.output(0), dest.input(0));
     let _ = context.resume();
     context.message_node(
@@ -42,6 +42,54 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     let _ = context.close();
     thread::sleep(time::Duration::from_millis(1000));
 
+    options.oscillator_type = Sawtooth;
+    let context = servo_media.create_audio_context(Default::default());
+    let dest = context.dest_node();
+    let osc3 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
+    context.connect_ports(osc3.output(0), dest.input(0));
+    thread::sleep(time::Duration::from_millis(3000));
+
+    let _ = context.resume();
+    context.message_node(
+        osc3,
+        AudioNodeMessage::AudioScheduledSourceNode(AudioScheduledSourceNodeMessage::Start(0.)),
+    );
+    thread::sleep(time::Duration::from_millis(3000));
+    let _ = context.close();
+    thread::sleep(time::Duration::from_millis(1000));
+
+    options.oscillator_type = Triangle;
+    let context = servo_media.create_audio_context(Default::default());
+    let dest = context.dest_node();
+    let osc4 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
+    context.connect_ports(osc4.output(0), dest.input(0));
+    thread::sleep(time::Duration::from_millis(3000));
+
+    let _ = context.resume();
+    context.message_node(
+        osc4,
+        AudioNodeMessage::AudioScheduledSourceNode(AudioScheduledSourceNodeMessage::Start(0.)),
+    );
+    thread::sleep(time::Duration::from_millis(3000));
+    let _ = context.close();
+    thread::sleep(time::Duration::from_millis(3000));
+
+    options.oscillator_type = Square;
+    let context = servo_media.create_audio_context(Default::default());
+    let dest = context.dest_node();
+    let osc2 = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
+    context.connect_ports(osc2.output(0), dest.input(0));
+    let _ = context.resume();
+    thread::sleep(time::Duration::from_millis(3000));
+    context.connect_ports(osc2.output(0), dest.input(0));
+    context.message_node(
+        osc2,
+        AudioNodeMessage::AudioScheduledSourceNode(AudioScheduledSourceNodeMessage::Start(0.)),
+    );
+    thread::sleep(time::Duration::from_millis(3000));
+    let _ = context.close();
+    thread::sleep(time::Duration::from_millis(1000));
+
     options.oscillator_type = Sawtooth;
     let context = servo_media.create_audio_context(Default::default());
     let dest = context.dest_node();
@@ -64,6 +112,15 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     let osc4 = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());
     context.connect_ports(osc4.output(0), dest.input(0));
     thread::sleep(time::Duration::from_millis(3000));
+    let _ = context.close();
+    thread::sleep(time::Duration::from_millis(1000));
+
+    options.oscillator_type = Custom;
+    let context = servo_media.create_audio_context(Default::default());
+    let dest = context.dest_node();
+    let osc5 = context.create_node(AudioNodeInit::OscillatorNode(options.clone()), Default::default());
+    context.connect_ports(osc5.output(0), dest.input(0));
+    thread::sleep(time::Duration::from_millis(3000));
 
     let _ = context.resume();
     context.message_node(