diff options
Diffstat (limited to 'src/portmod.rs')
| -rw-r--r-- | src/portmod.rs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/portmod.rs b/src/portmod.rs index 125fdab..9100570 100644 --- a/src/portmod.rs +++ b/src/portmod.rs @@ -74,7 +74,7 @@ impl Effect 'B' => Effect::PosJump(fxp), 'C' => Effect::PattBreak(fxp), 'D' => - match (fxp >> 8, fxp & 0x0f) + match (fxp >> 4, fxp & 0x0f) { (0, y) => Effect::VolumeSlide(Slide::Down(y)), (x, 0) => Effect::VolumeSlide(Slide::Up(x)), @@ -98,11 +98,11 @@ impl Effect _ => Effect::PortaUp(fxp) }, 'G' => Effect::TonePorta(fxp), - 'H' => Effect::Vibrato(fxp >> 8, fxp & 0x0f), - 'I' => Effect::Tremor(fxp >> 8, fxp & 0x0f), - 'J' => Effect::Arpeggio(fxp >> 8, fxp & 0x0f), + 'H' => Effect::Vibrato(fxp >> 4, fxp & 0x0f), + 'I' => Effect::Tremor(fxp >> 4, fxp & 0x0f), + 'J' => Effect::Arpeggio(fxp >> 4, fxp & 0x0f), 'K' => - match (fxp >> 8, fxp & 0x0f) + match (fxp >> 4, fxp & 0x0f) { (0, y) => Effect::VolumeSlideVib(Slide::Down(y)), (x, 0) => Effect::VolumeSlideVib(Slide::Up(x)), @@ -112,7 +112,7 @@ impl Effect _ => Effect::NoEffect }, 'L' => - match (fxp >> 8, fxp & 0x0f) + match (fxp >> 4, fxp & 0x0f) { (0, y) => Effect::VolumeSlideTPorta(Slide::Down(y)), (x, 0) => Effect::VolumeSlideTPorta(Slide::Up(x)), @@ -123,7 +123,7 @@ impl Effect }, 'M' => Effect::SetChannelVolume(fxp), 'N' => - match (fxp >> 8, fxp & 0x0f) + match (fxp >> 4, fxp & 0x0f) { (0, y) => Effect::ChVolSlide(Slide::Down(y)), (x, 0) => Effect::ChVolSlide(Slide::Up(x)), @@ -134,7 +134,7 @@ impl Effect }, 'O' => Effect::SampleOffset(fxp), 'P' => - match (fxp >> 8, fxp & 0x0f) + match (fxp >> 4, fxp & 0x0f) { (0, y) => Effect::PanSlide(Slide::Up(y)), (x, 0) => Effect::PanSlide(Slide::Down(x)), @@ -143,10 +143,10 @@ impl Effect (x, 0xf) => Effect::PanSlide(Slide::FineDown(x)), _ => Effect::NoEffect }, - 'Q' => Effect::Retrigger(fxp >> 8, fxp & 0x0f), - 'R' => Effect::Tremolo(fxp >> 8, fxp & 0x0f), + 'Q' => Effect::Retrigger(fxp >> 4, fxp & 0x0f), + 'R' => Effect::Tremolo(fxp >> 4, fxp & 0x0f), 'S' => - match (fxp >> 8, fxp & 0x0f) + match (fxp >> 4, fxp & 0x0f) { (0x1, e) => Effect::GlissandoCtrl(e != 0), (0x2, t) => Effect::SetFinetune(t), @@ -171,16 +171,16 @@ impl Effect _ => Effect::NoEffect }, 'T' => - match (fxp >> 8, fxp & 0x0f) + match (fxp >> 4, fxp & 0x0f) { (0x0, v) => Effect::TempoSlideDown(v), (0x1, v) => Effect::TempoSlideUp(v), _ => Effect::SetTempo(fxp) }, - 'U' => Effect::VibFine(fxp >> 8, fxp & 0x0f), + 'U' => Effect::VibFine(fxp >> 4, fxp & 0x0f), 'V' => Effect::SetGlobalVolume(fxp), 'W' => - match (fxp >> 8, fxp & 0x0f) + match (fxp >> 4, fxp & 0x0f) { (0, y) => Effect::GlobalVolumeSlide(Slide::Down(y)), (x, 0) => Effect::GlobalVolumeSlide(Slide::Up(x)), @@ -190,7 +190,7 @@ impl Effect _ => Effect::NoEffect }, 'X' => Effect::SetPan(fxp), - 'Y' => Effect::AutoPan(fxp >> 8, fxp & 0x0f), + 'Y' => Effect::AutoPan(fxp >> 4, fxp & 0x0f), 'Z' => Effect::MidiMacro(fxp), '\\' => Effect::SmoothMidiMacro(fxp), _ => Effect::NoEffect |