Merge pull request #389 from HEnquist/mixer_matrix

Mixer matrix

Author: HEnquist

CHANGELOG.md

@@ -2,9 +2,10 @@
 New features:
 - Add RACE processor.
 - Add option for custom log filtering.
-- Allow larger buffer target levels.
 Changes:
 - Add microsecond delay unit.
+- Allow larger buffer target levels.
+- Change mixer config rules to not allow duplicated channels.
 
 ## v3.0.0
 New features:

src/mixer.rs

@@ -108,6 +108,8 @@ impl Mixer {
 pub fn validate_mixer(mixer_config: &config::Mixer) -> Res<()> {
     let chan_in = mixer_config.channels.r#in;
     let chan_out = mixer_config.channels.out;
+    let mut output_channels: Vec<usize> = Vec::with_capacity(chan_out);
+    let mut input_channels: Vec<usize> = Vec::with_capacity(chan_in);
     for mapping in mixer_config.mapping.iter() {
         if mapping.dest >= chan_out {
             let msg = format!(
@@ -117,6 +119,15 @@ pub fn validate_mixer(mixer_config: &config::Mixer) -> Res<()> {
             );
             return Err(config::ConfigError::new(&msg).into());
         }
+        if output_channels.contains(&mapping.dest) {
+            let msg = format!(
+                "There is more than one mapping for destination channel {}",
+                mapping.dest,
+            );
+            return Err(config::ConfigError::new(&msg).into());
+        }
+        output_channels.push(mapping.dest);
+        input_channels.clear();
         for source in mapping.sources.iter() {
             if source.channel >= chan_in {
                 let msg = format!(
@@ -126,6 +137,13 @@ pub fn validate_mixer(mixer_config: &config::Mixer) -> Res<()> {
                 );
                 return Err(config::ConfigError::new(&msg).into());
             }
+            if input_channels.contains(&source.channel) {
+                let msg = format!(
+                    "Input channel {} is listed mote than once for destination channel {}",
+                    source.channel, mapping.dest,
+                );
+                return Err(config::ConfigError::new(&msg).into());
+            }
         }
     }
     Ok(())