wip

common/src/effect/effect_type.rs

@@ -33,59 +33,55 @@ impl EffectType {
                 if up {
                     if *value < 1000 {
                         *value += 1;
-                        return true
+                        return true;
                     }
-                }
-                else {
+                } else {
                     if *value > 0 {
                         *value -= 1;
-                        return true
+                        return true;
                     }
                 }
-            },
+            }
             Self::Pan(value) => {
                 if up {
                     if *value < 500 {
                         *value += 1;
-                        return true
+                        return true;
                     }
-                }
-                else {
+                } else {
                     if *value > -500 {
                         *value -= 1;
-                        return true
+                        return true;
                     }
                 }
             }
             Self::PitchBend(value) => {
                 if up {
                     if *value < 16383 {
                         *value += 1;
-                        return true
+                        return true;
                     }
-                }
-                else {
+                } else {
                     if *value > 0 {
                         *value -= 1;
-                        return true
+                        return true;
                     }
                 }
             }
             Self::ChannelPressure(value) | Self::PolyphonicKeyPressure { key: _, value } => {
                 if up {
                     if *value < 127 {
                         *value += 1;
-                        return true
+                        return true;
                     }
-                }
-                else {
+                } else {
                     if *value > 0 {
                         *value -= 1;
-                        return true
+                        return true;
                     }
                 }
             }
-        } 
+        }
         false
     }
 }

common/src/effect/valueless_effect_type.rs

@@ -1,5 +1,5 @@
-use serde::{Deserialize, Serialize};
 use super::effect_type::EffectType;
+use serde::{Deserialize, Serialize};
 
 /// A hashable EffectType.
 #[derive(Copy, Clone, Debug, Default, Eq, PartialEq, Hash, Deserialize, Serialize)]
@@ -34,7 +34,9 @@ impl ValuelessEffectType {
             EffectType::Pan(_) => *self == Self::Pan,
             EffectType::PitchBend(_) => *self == Self::PitchBend,
             EffectType::ChannelPressure(_) => *self == Self::ChannelPressure,
-            EffectType::PolyphonicKeyPressure { key: _, value: _ } => *self == Self::PolyphonicKeyPressure,
+            EffectType::PolyphonicKeyPressure { key: _, value: _ } => {
+                *self == Self::PolyphonicKeyPressure
+            }
         }
     }
-}
+}

common/src/index.rs

@@ -4,10 +4,8 @@ use serde::{Deserialize, Serialize};
 use std::fmt::Display;
 use std::ops::{AddAssign, SubAssign};
 
-
 /// This is used to make const zero and one per type.
-pub trait Indexable<T>
-{
+pub trait Indexable<T> {
     const ZERO: T;
     const ONE: T;
 }

common/src/lib.rs

@@ -27,15 +27,15 @@ mod paths_state;
 mod state;
 pub mod time;
 pub mod view;
-pub use effect::{Effect, effect_type::EffectType, valueless_effect_type::ValuelessEffectType};
+pub use effect::{effect_type::EffectType, valueless_effect_type::ValuelessEffectType, Effect};
 pub use event::Event;
 pub use index::Index;
 mod indexed_values;
 pub use indexed_values::IndexedValues;
 pub use input_state::InputState;
 pub use midi_track::MidiTrack;
 pub use music::*;
-pub use note::{Note, MAX_NOTE, MIN_NOTE, NOTE_NAMES, MIDDLE_C};
+pub use note::{Note, MAX_NOTE, MIDDLE_C, MIN_NOTE, NOTE_NAMES};
 pub use panel_type::PanelType;
 pub use paths::Paths;
 pub use state::State;

common/src/state.rs

@@ -1,5 +1,5 @@
-use crate::ValuelessEffectType;
 use crate::music_panel_field::MusicPanelField;
+use crate::ValuelessEffectType;
 use crate::{
     EditMode, Index, IndexedEditModes, IndexedValues, InputState, Music, PanelType, PianoRollMode,
     Selection, Time, View,

data/config.ini

@@ -211,9 +211,14 @@ CloseLinksPanel = {"keys": ["Escape"]}
 # Effects.
 NextEffect = {"keys": ["Down"], "dt": 10}
 PreviousEffect = {"keys": ["Up"], "dt": 10}
+EffectTimeLeft = {"keys": ["Left"], "mods": ["LeftShift"], "dt": 5}
+EffectTimeRight = {"keys": ["Right"], "mods": ["LeftShift"], "dt": 5}
 IncrementEffectValue = {"keys": ["Right"], "dt": 2}
 DecrementEffectValue = {"keys": ["Left"], "dt": 2}
-DeleteEffect = {"keys": ["Delete"]}
+IncrementAftertouchNote = {"keys": ["Right"], "mods": ["LeftControl", "LeftShift"], "dt": 5}
+DecrementAftertouchNote = {"keys": ["Left"], "mods": ["LeftControl", "LeftShift"], "dt": 5}
+AddEffect = {"keys": ["Return"]}
+RemoveEffect = {"keys": ["Delete"]}
 
 # Qwerty note input.
 C = {"keys": ["A"]}

data/text.csv

@@ -502,5 +502,11 @@ EFFECT_TYPE_PITCH_BEND,Pitch Bend
 EFFECT_TYPE_CHANNEL_PRESSURE,Channel Pressure
 EFFECT_TYPE_POLYPHONIC_KEY_PRESSURE,Aftertouch
 EFFECTS_PANEL_INPUT_TTS_SCROLL,\0 and \1 to scroll.
-EFFECTS_PANEL_INPUT_TTS_VALUE,\0 and \1 to set the effect value.
-EFFECTS_PANEL_INPUT_TTS_AFTERTOCH_KEY,\0 and \1 to set the aftertouch note.
+EFFECTS_PANEL_INPUT_TTS_ADD,\0 to add a %0 effect.
+EFFECTS_PANEL_INPUT_TTS_REMOVE,\0 to remove a %0 effect.
+EFFECTS_PANEL_INPUT_TTS_TIME,\0 and \1 to set the time.
+EFFECTS_PANE_INPUT_TTS_VALUE,\0 and \1 to set the effect's value.
+EFFECTS_PANEL_INPUT_TTS_AFTERTOUCH,\0 and \1 to set the aftertouch note.
+EFFECTS_PANEL_STATUS_TTS_NO_EFFECT,The selected effect is \0 but you haven't added this effect.
+EFFECTS_PANEL_STATUS_TTS_EFFECT_NAME,The selected effect is \0. The value is \1. The time is \2.
+EFFECTS_PANEL_STATUS_TTS_AFTERTOUCH_KEY,The aftertouch note is \0.

input/src/input_event.rs

@@ -133,9 +133,14 @@ pub enum InputEvent {
     // Effects panel.
     NextEffect,
     PreviousEffect,
+    EffectTimeLeft,
+    EffectTimeRight,
     IncrementEffectValue,
     DecrementEffectValue,
-    DeleteEffect,
+    IncrementAftertouchNote,
+    DecrementAftertouchNote,
+    AddEffect,
+    RemoveEffect,
     // Qwerty note input.
     C,
     CSharp,