From 3306c431c37a2223c2433bfb30c926336da10a69 Mon Sep 17 00:00:00 2001 From: "5684185+vsariola@users.noreply.github.com" <5684185+vsariola@users.noreply.github.com> Date: Wed, 16 Oct 2024 13:44:50 +0300 Subject: [PATCH] refactor(tracker): use List.DeleteElements to delete tracks/instrs --- tracker/action.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/tracker/action.go b/tracker/action.go index c772d62..0a385aa 100644 --- a/tracker/action.go +++ b/tracker/action.go @@ -66,16 +66,7 @@ func (m *Model) AddTrack() Action { func (m *Model) DeleteTrack() Action { return Action{ allowed: func() bool { return len(m.d.Song.Score.Tracks) > 0 }, - do: func() { - defer (*Model)(m).change("DeleteTrackAction", ScoreChange, MajorChange)() - m.d.Cursor.Track = intMax(intMin(m.d.Cursor.Track, len(m.d.Song.Score.Tracks)-1), 0) - newTracks := make([]sointu.Track, len(m.d.Song.Score.Tracks)-1) - copy(newTracks, m.d.Song.Score.Tracks[:m.d.Cursor.Track]) - copy(newTracks[m.d.Cursor.Track:], m.d.Song.Score.Tracks[m.d.Cursor.Track+1:]) - m.d.Cursor.Track = intMax(intMin(m.d.Cursor.Track, len(m.d.Song.Score.Tracks)-1), 0) - m.d.Song.Score.Tracks = newTracks - m.d.Cursor2 = m.d.Cursor - }, + do: func() { m.Tracks().List().DeleteElements(false) }, } } @@ -104,10 +95,7 @@ func (m *Model) AddInstrument() Action { func (m *Model) DeleteInstrument() Action { return Action{ allowed: func() bool { return len((*Model)(m).d.Song.Patch) > 0 }, - do: func() { - defer (*Model)(m).change("DeleteInstrumentAction", PatchChange, MajorChange)() - m.d.Song.Patch = append(m.d.Song.Patch[:m.d.InstrIndex], m.d.Song.Patch[m.d.InstrIndex+1:]...) - }, + do: func() { m.Instruments().List().DeleteElements(false) }, } }