mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-05-28 03:10:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tracker): shorten the names of model.PlayFrom... methods

Browse Source
This commit is contained in:
5684185+vsariola@users.noreply.github.com 2024-10-12 21:31:56 +03:00
parent a6bb5c2afc
commit 59c04ed4a1
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tracker/action.go
View File

@ -275,7 +275,7 @@ func (m *Model) RemoveUnused() Action {
}) })
} }
func (m *Model) PlayFromCurrentPosition() Action { func (m *Model) PlayCurrentPos() Action {
return Action{ return Action{
allowed: func() bool { return !m.instrEnlarged }, allowed: func() bool { return !m.instrEnlarged },
do: func() { do: func() {
@ -287,7 +287,7 @@ func (m *Model) PlayFromCurrentPosition() Action {
} }
} }
func (m *Model) PlayFromSongStart() Action { func (m *Model) PlaySongStart() Action {
return Action{ return Action{
allowed: func() bool { return !m.instrEnlarged }, allowed: func() bool { return !m.instrEnlarged },
do: func() { do: func() {

8
tracker/gioui/keyevent.go
View File

@ -149,16 +149,16 @@ func (t *Tracker) KeyEvent(e key.Event, gtx C) {
t.RemoveUnused().Do() t.RemoveUnused().Do()
case "PlayCurrentPosFollow": case "PlayCurrentPosFollow":
t.NoteTracking().Bool().Set(true) t.NoteTracking().Bool().Set(true)
t.PlayFromCurrentPosition().Do() t.PlayCurrentPos().Do()
case "PlayCurrentPosUnfollow": case "PlayCurrentPosUnfollow":
t.NoteTracking().Bool().Set(false) t.NoteTracking().Bool().Set(false)
t.PlayFromCurrentPosition().Do() t.PlayCurrentPos().Do()
case "PlaySongStartFollow": case "PlaySongStartFollow":
t.NoteTracking().Bool().Set(true) t.NoteTracking().Bool().Set(true)
t.PlayFromSongStart().Do() t.PlaySongStart().Do()
case "PlaySongStartUnfollow": case "PlaySongStartUnfollow":
t.NoteTracking().Bool().Set(false) t.NoteTracking().Bool().Set(false)
t.PlayFromSongStart().Do() t.PlaySongStart().Do()
case "PlaySelectedFollow": case "PlaySelectedFollow":
t.NoteTracking().Bool().Set(true) t.NoteTracking().Bool().Set(true)
t.PlaySelected().Do() t.PlaySelected().Do()

2
tracker/gioui/songpanel.go
View File

@ -64,7 +64,7 @@ func NewSongPanel(model *tracker.Model) *SongPanel {
RecordBtn: NewBoolClickable(model.IsRecording().Bool()), RecordBtn: NewBoolClickable(model.IsRecording().Bool()),
NoteTracking: NewBoolClickable(model.NoteTracking().Bool()), NoteTracking: NewBoolClickable(model.NoteTracking().Bool()),
PlayingBtn: NewBoolClickable(model.Playing().Bool()), PlayingBtn: NewBoolClickable(model.Playing().Bool()),
RewindBtn: NewActionClickable(model.PlayFromSongStart()), RewindBtn: NewActionClickable(model.PlaySongStart()),
} }
ret.fileMenuItems = []MenuItem{ ret.fileMenuItems = []MenuItem{
{IconBytes: icons.ContentClear, Text: "New Song", ShortcutText: keyActionMap["NewSong"], Doer: model.NewSong()}, {IconBytes: icons.ContentClear, Text: "New Song", ShortcutText: keyActionMap["NewSong"], Doer: model.NewSong()},

2
tracker/model_test.go
View File

@ -82,7 +82,7 @@ func (s *modelFuzzState) Iterate(yield func(string, func(p string, t *testing.T)
s.IterateAction("AddOctave", s.model.AddOctave(), yield, seed) s.IterateAction("AddOctave", s.model.AddOctave(), yield, seed)
s.IterateAction("SubtractOctave", s.model.SubtractOctave(), yield, seed) s.IterateAction("SubtractOctave", s.model.SubtractOctave(), yield, seed)
s.IterateAction("EditNoteOff", s.model.EditNoteOff(), yield, seed) s.IterateAction("EditNoteOff", s.model.EditNoteOff(), yield, seed)
s.IterateAction("Rewind", s.model.PlayFromSongStart(), yield, seed) s.IterateAction("PlaySongStart", s.model.PlaySongStart(), yield, seed)
s.IterateAction("AddOrderRowAfter", s.model.AddOrderRow(false), yield, seed) s.IterateAction("AddOrderRowAfter", s.model.AddOrderRow(false), yield, seed)
s.IterateAction("AddOrderRowBefore", s.model.AddOrderRow(true), yield, seed) s.IterateAction("AddOrderRowBefore", s.model.AddOrderRow(true), yield, seed)
s.IterateAction("DeleteOrderRowForward", s.model.DeleteOrderRow(false), yield, seed) s.IterateAction("DeleteOrderRowForward", s.model.DeleteOrderRow(false), yield, seed)