mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-05-27 19:00:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat(tracker): move unnecessary members from modelData to Model

Browse Source
This commit is contained in:
5684185+vsariola@users.noreply.github.com 2023-10-20 17:39:40 +03:00
parent 391b14493c
commit 9ec8f48f82
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tracker/model.go
View File

@ -33,16 +33,11 @@ type (
UnitIndex int UnitIndex int
ParamIndex int ParamIndex int
Octave int Octave int
NoteTracking bool
UsedIDs map[int]bool UsedIDs map[int]bool
MaxID int MaxID int
FilePath string FilePath string
ChangedSinceSave bool ChangedSinceSave bool
PatternUseCount [][]int PatternUseCount [][]int
Panic bool
Playing bool
Recording bool
PlayPosition ScoreRow
InstrEnlarged bool InstrEnlarged bool
RecoveryFilePath string RecoveryFilePath string
ChangedSinceRecovery bool ChangedSinceRecovery bool
@ -56,6 +51,12 @@ type (
undoStack []modelData undoStack []modelData
redoStack []modelData redoStack []modelData
panic bool
playing bool
recording bool
playPosition ScoreRow
noteTracking bool
PlayerMessages <-chan PlayerMessage PlayerMessages <-chan PlayerMessage
modelMessages chan<- interface{} modelMessages chan<- interface{}
} }
@ -241,8 +242,8 @@ func (m *Model) SetOctave(value int) bool {
} }
func (m *Model) ProcessPlayerMessage(msg PlayerMessage) { func (m *Model) ProcessPlayerMessage(msg PlayerMessage) {
m.d.PlayPosition = msg.SongRow m.playPosition = msg.SongRow
m.d.Panic = msg.Panic m.panic = msg.Panic
switch e := msg.Inner.(type) { switch e := msg.Inner.(type) {
case Recording: case Recording:
if e.BPM == 0 { if e.BPM == 0 {
@ -457,18 +458,18 @@ func (m *Model) NoteOff(id NoteID) {
} }
func (m *Model) Playing() bool { func (m *Model) Playing() bool {
return m.d.Playing return m.playing
} }
func (m *Model) SetPlaying(val bool) { func (m *Model) SetPlaying(val bool) {
if m.d.Playing != val { if m.playing != val {
m.d.Playing = val m.playing = val
m.send(ModelPlayingChangedMessage{val}) m.send(ModelPlayingChangedMessage{val})
} }
} }
func (m *Model) PlayPosition() ScoreRow { func (m *Model) PlayPosition() ScoreRow {
return m.d.PlayPosition return m.playPosition
} }
func (m *Model) CanAddInstrument() bool { func (m *Model) CanAddInstrument() bool {
@ -624,26 +625,26 @@ func (m *Model) AdjustPatternNumber(delta int, swap bool) {
} }
func (m *Model) SetRecording(val bool) { func (m *Model) SetRecording(val bool) {
if m.d.Recording != val { if m.recording != val {
m.d.Recording = val m.recording = val
m.d.InstrEnlarged = val m.d.InstrEnlarged = val
m.send(ModelRecordingMessage{val}) m.send(ModelRecordingMessage{val})
} }
} }
func (m *Model) Recording() bool { func (m *Model) Recording() bool {
return m.d.Recording return m.recording
} }
func (m *Model) SetPanic(val bool) { func (m *Model) SetPanic(val bool) {
if m.d.Panic != val { if m.panic != val {
m.d.Panic = val m.panic = val
m.send(ModelPanicMessage{val}) m.send(ModelPanicMessage{val})
} }
} }
func (m *Model) Panic() bool { func (m *Model) Panic() bool {
return m.d.Panic return m.panic
} }
func (m *Model) SetInstrEnlarged(val bool) { func (m *Model) SetInstrEnlarged(val bool) {
@ -655,7 +656,7 @@ func (m *Model) InstrEnlarged() bool {
} }
func (m *Model) PlayFromPosition(sr ScoreRow) { func (m *Model) PlayFromPosition(sr ScoreRow) {
m.d.Playing = true m.playing = true
m.send(ModelPlayFromPositionMessage{sr}) m.send(ModelPlayFromPositionMessage{sr})
} }
@ -1067,11 +1068,11 @@ func (m *Model) CanRedo() bool {
} }
func (m *Model) SetNoteTracking(value bool) { func (m *Model) SetNoteTracking(value bool) {
m.d.NoteTracking = value m.noteTracking = value
} }
func (m *Model) NoteTracking() bool { func (m *Model) NoteTracking() bool {
return m.d.NoteTracking return m.noteTracking
} }
func (m *Model) Song() sointu.Song { func (m *Model) Song() sointu.Song {