Applied cargo fmt

Author: chris-zen

Cargo.lock

@@ -26,6 +26,7 @@ typenum = "1.11.2"
 generic-array = "0.14.2"
 
 cpal = { git = "https://github.com/RustAudio/cpal", branch = "master" }
+#cpal = "0.11.0"
 
 #druid = { git = "https://github.com/xi-editor/druid", branch = "master", features = ["im"] }
 #druid = { path = "../../druid-orig/druid", features = ["im"] }

kiro-synth-host/Cargo.toml

@@ -1,23 +1,29 @@
+use druid_icon_generator::file::IconFile;
 use druid_icon_generator::generator::Generator;
 use druid_icon_generator::library::IconLibrary;
-use druid_icon_generator::file::IconFile;
 use regex::Regex;
 
 fn main() {
   let icon_name_regex = Regex::new(r"^(.*)\.svg$").unwrap();
 
-  let icons = IconLibrary::new("art/icons").iter()
-      .filter_map(|icon_file| {
-        icon_name_regex.captures(icon_file.name.clone().as_str()).map(|captures| {
-          IconFile {
-            name: captures.get(1).unwrap().as_str().to_string(),
-            ..icon_file
-          }
+  let icons = IconLibrary::new("art/icons")
+    .iter()
+    .filter_map(|icon_file| {
+      icon_name_regex
+        .captures(icon_file.name.clone().as_str())
+        .map(|captures| IconFile {
+          name: captures.get(1).unwrap().as_str().to_string(),
+          ..icon_file
         })
-      })
-      .filter_map(|icon_file| {
-        icon_file.load().ok().map(|icon_data| (icon_file, icon_data))
-      });
+    })
+    .filter_map(|icon_file| {
+      icon_file
+        .load()
+        .ok()
+        .map(|icon_data| (icon_file, icon_data))
+    });
 
-  Generator::new("src/ui/icons/mod.rs").generate(icons).unwrap();
+  Generator::new("src/ui/icons/mod.rs")
+    .generate(icons)
+    .unwrap();
 }

kiro-synth-host/build.rs

@@ -1,9 +1,9 @@
 use anyhow::Result;
 use thiserror::Error;
 
-use cpal::{Device, StreamConfig, SampleRate, Stream, OutputCallbackInfo};
-use cpal::{DefaultStreamConfigError, BuildStreamError, PlayStreamError};
 use cpal::traits::{DeviceTrait, HostTrait, StreamTrait};
+use cpal::{BuildStreamError, DefaultStreamConfigError, PlayStreamError};
+use cpal::{Device, OutputCallbackInfo, SampleRate, Stream, StreamConfig};
 
 #[derive(Error, Debug)]
 pub enum AudioError {
@@ -33,15 +33,19 @@ pub struct AudioDriver {
 }
 
 impl AudioDriver {
-  pub fn new<Handler: AudioHandler + 'static>(sample_rate: u32, mut handler: Handler) -> Result<Self> {
+  pub fn new<Handler: AudioHandler + 'static>(
+    sample_rate: u32,
+    mut handler: Handler,
+  ) -> Result<Self> {
     let host = cpal::default_host();
 
     let device = host
       .default_output_device()
       .ok_or(AudioError::NoDefaultOutputDevice)?;
     println!("Using default output device: '{}'", device.name()?);
 
-    let mut config: StreamConfig = device.default_output_config()
+    let mut config: StreamConfig = device
+      .default_output_config()
       .map_err(|source| AudioError::NoDefaultStreamConfig(source))?
       .into();
 
@@ -71,9 +75,7 @@ impl AudioDriver {
       },
     )?;
 
-    stream
-      .play()
-      .map_err(|err| AudioError::PlayStream(err))?;
+    stream.play().map_err(|err| AudioError::PlayStream(err))?;
 
     Ok(AudioDriver {
       _device: device,

kiro-synth-host/src/audio.rs

@@ -3,24 +3,24 @@ mod midi;
 mod synth;
 pub mod ui;
 
-use std::sync::{Mutex, Arc};
+use std::sync::{Arc, Mutex};
 
 use anyhow::Result;
 use ringbuf::RingBuffer;
 
 use kiro_synth_core::float::Float;
-use kiro_synth_midi::messages::Message as MidiMessage;
-use kiro_synth_engine::program::Program;
 use kiro_synth_engine::event::Event;
-use kiro_synth_engine::synth::Synth;
 use kiro_synth_engine::globals::SynthGlobals;
+use kiro_synth_engine::program::Program;
+use kiro_synth_engine::synth::Synth;
+use kiro_synth_midi::messages::Message as MidiMessage;
 
 use crate::audio::AudioDriver;
 use crate::midi::drivers::{MidiDriver, MidiHandler};
 use crate::midi::mapper::MidiMapper;
-use crate::synth::{SynthClient, SynthClientMutex, SynthAudioHandler, SynthFeedback};
 use crate::synth::program::kiro::KiroModule;
-use crate::ui::{Synth as SynthData};
+use crate::synth::{SynthAudioHandler, SynthClient, SynthClientMutex, SynthFeedback};
+use crate::ui::Synth as SynthData;
 
 const SAMPLE_RATE: u32 = 44100;
 
@@ -46,15 +46,17 @@ fn main() -> Result<()> {
 
   // SYNTH CLIENT
 
-  let synth_client = Arc::new(Mutex::new(
-    SynthClient::new(synth_globals.clone(), events_producer, feedback_consumer)
-  ));
+  let synth_client = Arc::new(Mutex::new(SynthClient::new(
+    synth_globals.clone(),
+    events_producer,
+    feedback_consumer,
+  )));
 
   // PROGRAM
 
   let (program, module) = KiroModule::new_program(
     synth_globals.lfo_waveforms.len(),
-    synth_globals.osc_waveforms.len()
+    synth_globals.osc_waveforms.len(),
   );
 
   // UI DATA
@@ -93,7 +95,7 @@ impl EventsMidiHandler {
   pub fn new(midi_mapper: MidiMapper<f32>, synth_client: Arc<Mutex<SynthClient<f32>>>) -> Self {
     EventsMidiHandler {
       midi_mapper,
-      synth_client
+      synth_client,
     }
   }
 }
@@ -102,18 +104,38 @@ impl MidiHandler for EventsMidiHandler {
   fn on_message(&mut self, timestamp: u64, message: MidiMessage) {
     println!("{:014}: {:?}", timestamp, message);
     match message {
-      MidiMessage::NoteOn { channel: _, key, velocity } => {
-        self.synth_client.lock().unwrap().send_note_on(key, velocity as f32 / 127.0);
-      },
-      MidiMessage::NoteOff { channel: _, key, velocity } => {
-        self.synth_client.lock().unwrap().send_note_off(key, velocity as f32 / 127.0);
-      },
+      MidiMessage::NoteOn {
+        channel: _,
+        key,
+        velocity,
+      } => {
+        self
+          .synth_client
+          .lock()
+          .unwrap()
+          .send_note_on(key, velocity as f32 / 127.0);
+      }
+      MidiMessage::NoteOff {
+        channel: _,
+        key,
+        velocity,
+      } => {
+        self
+          .synth_client
+          .lock()
+          .unwrap()
+          .send_note_off(key, velocity as f32 / 127.0);
+      }
       MidiMessage::PitchBend { channel: _, value } => {
         if let Some(event) = self.midi_mapper.map_midi_pitch_bend(value) {
           self.synth_client.lock().unwrap().send_event(event);
         }
-      },
-      MidiMessage::ControlChange { channel: _, controller, value } => {
+      }
+      MidiMessage::ControlChange {
+        channel: _,
+        controller,
+        value,
+      } => {
         if let Some(event) = self.midi_mapper.map_midi_controller(controller, value) {
           self.synth_client.lock().unwrap().send_event(event);
         }
@@ -142,31 +164,46 @@ fn create_midi_mapper<F: Float>(program: &Program<F>, module: &KiroModule) -> Mi
   midi_mapper.rel_controller(26, program.get_param(module.params.dca.amplitude.reference));
   midi_mapper.rel_controller(27, program.get_param(module.params.dca.pan.reference));
 
-//  midi_mapper.rel_controller(29, program.get_param(module.params.osc2.amplitude.reference));
-//  midi_mapper.rel_controller(30, program.get_param(module.params.osc2.shape.reference));
-//  midi_mapper.rel_controller(31, program.get_param(module.params.osc2.octave.reference));
-//  midi_mapper.rel_controller(32, program.get_param(module.params.osc2.semitones.reference));
-//  midi_mapper.rel_controller(33, program.get_param(module.params.osc2.cents.reference));
+  //  midi_mapper.rel_controller(29, program.get_param(module.params.osc2.amplitude.reference));
+  //  midi_mapper.rel_controller(30, program.get_param(module.params.osc2.shape.reference));
+  //  midi_mapper.rel_controller(31, program.get_param(module.params.osc2.octave.reference));
+  //  midi_mapper.rel_controller(32, program.get_param(module.params.osc2.semitones.reference));
+  //  midi_mapper.rel_controller(33, program.get_param(module.params.osc2.cents.reference));
 
   midi_mapper.rel_controller(29, program.get_param(module.params.eg1.attack.reference));
   midi_mapper.rel_controller(30, program.get_param(module.params.eg1.decay.reference));
   midi_mapper.rel_controller(31, program.get_param(module.params.eg1.sustain.reference));
   midi_mapper.rel_controller(32, program.get_param(module.params.eg1.release.reference));
   midi_mapper.rel_controller(33, program.get_param(module.params.eg1.mode.reference));
   midi_mapper.rel_controller(34, program.get_param(module.params.eg1.legato.reference));
-  midi_mapper.rel_controller(35, program.get_param(module.params.eg1.reset_to_zero.reference));
+  midi_mapper.rel_controller(
+    35,
+    program.get_param(module.params.eg1.reset_to_zero.reference),
+  );
   midi_mapper.rel_controller(36, program.get_param(module.params.eg1.dca_mod.reference));
 
-  midi_mapper.rel_controller(41, program.get_param(module.params.osc3.amplitude.reference));
+  midi_mapper.rel_controller(
+    41,
+    program.get_param(module.params.osc3.amplitude.reference),
+  );
   midi_mapper.rel_controller(42, program.get_param(module.params.osc3.shape.reference));
   midi_mapper.rel_controller(43, program.get_param(module.params.osc3.octaves.reference));
-  midi_mapper.rel_controller(44, program.get_param(module.params.osc3.semitones.reference));
+  midi_mapper.rel_controller(
+    44,
+    program.get_param(module.params.osc3.semitones.reference),
+  );
   midi_mapper.rel_controller(45, program.get_param(module.params.osc3.cents.reference));
 
-  midi_mapper.rel_controller(49, program.get_param(module.params.osc4.amplitude.reference));
+  midi_mapper.rel_controller(
+    49,
+    program.get_param(module.params.osc4.amplitude.reference),
+  );
   midi_mapper.rel_controller(50, program.get_param(module.params.osc4.shape.reference));
   midi_mapper.rel_controller(51, program.get_param(module.params.osc4.octaves.reference));
-  midi_mapper.rel_controller(52, program.get_param(module.params.osc4.semitones.reference));
+  midi_mapper.rel_controller(
+    52,
+    program.get_param(module.params.osc4.semitones.reference),
+  );
   midi_mapper.rel_controller(53, program.get_param(module.params.osc4.cents.reference));
 
   midi_mapper.rel_controller(54, program.get_param(module.params.filter1.mode.reference));

kiro-synth-host/src/main.rs

@@ -43,7 +43,7 @@ where
 
 pub struct CoreMidiDriver {
   _client: Client,
-  _input_port: InputPort
+  _input_port: InputPort,
 }
 
 impl CoreMidiDriver {
@@ -90,7 +90,7 @@ impl CoreMidiDriver {
     decoder: &mut Decoder,
     handler: &mut Handler,
   ) {
-//    println!("{:?}", packet_list);
+    //    println!("{:?}", packet_list);
     for packet in packet_list.iter() {
       let timestamp = packet.timestamp();
       let mut source = packet.data().iter().map(|v| *v);

kiro-synth-host/src/midi/drivers/coremidi.rs

@@ -4,7 +4,9 @@ use thiserror::Error;
 mod coremidi;
 
 #[cfg(target_os = "macos")]
-pub use crate::midi::drivers::coremidi::{CoreMidiDriver as MidiDriver, CoreMidiError as MidiErrorSource};
+pub use crate::midi::drivers::coremidi::{
+  CoreMidiDriver as MidiDriver, CoreMidiError as MidiErrorSource,
+};
 
 use kiro_synth_midi::messages::Message;