add bend_down & bend_up opcodes #3

also minor renames of a couple private functions

Author: joseluis

src/lib.rs

@@ -1,3 +1,6 @@
+//!
+//!
+
 pub mod error;
 pub(crate) mod sfz;
 pub(crate) mod utils;

src/sfz/instrument.rs

@@ -158,7 +158,7 @@ impl Instrument {
                         }
                     } else {
                         // an opcode for the <region>
-                        if status.are_regions() {
+                        if status.are_regions_in_current_group() {
                             #[cfg(debug)]
                             println!(
                                 "  - new region opcode: {:?} (g{} r{})",
@@ -365,7 +365,7 @@ impl InstrumentParsingStatus {
         // ensure we are out of the <global> header
         self.is_header_global = false;
         // ensure we reset the region counter for the current group
-        self.region_reset();
+        self.region_reset_in_current_group();
         // increment the group counter
         self.group_increment();
     }
@@ -435,9 +435,9 @@ impl InstrumentParsingStatus {
     }
 
     /// Resets the region counter for the group
-    fn region_reset(&mut self) {
+    fn region_reset_in_current_group(&mut self) {
         #[cfg(debug)]
-        println!("  status.region_reset()");
+        println!("  status.region_reset_in_current_group()");
         self.region_counter_in_group = None;
     }
 
@@ -463,7 +463,7 @@ impl InstrumentParsingStatus {
     }
 
     /// Are there any regions already defined for the current group?
-    pub fn are_regions(&self) -> bool {
+    pub fn are_regions_in_current_group(&self) -> bool {
         if self.region_counter_in_group == None {
             return false;
         }

src/sfz/opcodes/defaults.rs

@@ -15,6 +15,8 @@ pub(crate) static OPCODE_DEFAULT: phf::Map<&'static str, OpcodeType> = phf_map!
     "ampeg_hold" => OpcodeType::f32(Some(0.0)),
     "ampeg_release" => OpcodeType::f32(Some(0.0)),
     "ampeg_sustain" => OpcodeType::f32(Some(100.0)),
+    "bend_down" => OpcodeType::i16(Some(-200)),
+    "bend_up" => OpcodeType::i16(Some(200)),
     "cutoff" => OpcodeType::f32(None),
     "fil_type" => OpcodeType::fil_type(Some(fil_type::lpf_2p)),
     "fil_veltrack" => OpcodeType::i16(Some(0)),

src/sfz/opcodes/parse.rs

@@ -172,6 +172,8 @@ impl Opcode {
             ("ampeg_sustain", _) => {
                 utils::check_f32_between(value, 0., 100.).map(Opcode::ampeg_sustain)
             }
+            ("bend_down", _) => utils::check_i16_between(value, -9600, 9600).map(Opcode::bend_down),
+            ("bend_up", _) => utils::check_i16_between(value, -9600, 9600).map(Opcode::bend_up),
             // NOTE: upper range is SampleRate/2 (it should be checked when sample rate is known)
             ("cutoff", _) => {
                 utils::check_f32_between(value, 0., MAX_SAMPLE_RATE).map(Opcode::cutoff)