mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2026-02-07 16:20:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tracker): group Model methods, with each group in one source file

Browse Source
This commit is contained in:
5684185+vsariola@users.noreply.github.com
2026-01-25 13:08:45 +02:00
parent b93304adab
commit 86ca3fb300
44 changed files with 4813 additions and 4482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/sointu-track/main.go
View File

@ -8,7 +8,6 @@ import (
"path/filepath"
"runtime"
"runtime/pprof"
"time"
"gioui.org/app"
"github.com/vsariola/sointu"
@ -60,15 +59,11 @@ func main() {
}
model := tracker.NewModel(broker, cmd.Synthers, midiContext, recoveryFile)
player := tracker.NewPlayer(broker, cmd.Synthers[0])
detector := tracker.NewDetector(broker)
specan := tracker.NewSpecAnalyzer(broker)
go detector.Run()
go specan.Run()
if a := flag.Args(); len(a) > 0 {
f, err := os.Open(a[0])
if err == nil {
model.ReadSong(f)
model.Song().Read(f)
}
f.Close()
}
@ -82,10 +77,7 @@ func main() {
go func() {
trackerUi.Main()
audioCloser.Close()
tracker.TrySend(broker.CloseDetector, struct{}{})
tracker.TrySend(broker.CloseSpecAn, struct{}{})
tracker.TimeoutReceive(broker.FinishedDetector, 3*time.Second)
tracker.TimeoutReceive(broker.FinishedSpecAn, 3*time.Second)
model.Close()
if *cpuprofile != "" {
pprof.StopCPUProfile()
f.Close()

17
cmd/sointu-vsti/main.go
View File

@ -48,18 +48,14 @@ func init() {
broker := tracker.NewBroker()
model := tracker.NewModel(broker, cmd.Synthers, cmd.NewMidiContext(broker), recoveryFile)
player := tracker.NewPlayer(broker, cmd.Synthers[0])
detector := tracker.NewDetector(broker)
specan := tracker.NewSpecAnalyzer(broker)
go detector.Run()
go specan.Run()
t := gioui.NewTracker(model)
model.InstrEnlarged().SetValue(true)
model.Play().TrackerHidden().SetValue(true)
// since the VST is usually working without any regard for the tracks
// until recording, disable the Instrument-Track linking by default
// because it might just confuse the user why instrument cannot be
// swapped/added etc.
model.LinkInstrTrack().SetValue(false)
model.Track().LinkInstrument().SetValue(false)
go t.Main()
context := &VSTIProcessContext{host: h}
buf := make(sointu.AudioBuffer, 1024)
@ -112,24 +108,21 @@ func init() {
}
},
CloseFunc: func() {
tracker.TrySend(broker.CloseDetector, struct{}{})
tracker.TrySend(broker.CloseGUI, struct{}{})
tracker.TrySend(broker.CloseSpecAn, struct{}{})
tracker.TimeoutReceive(broker.FinishedDetector, 3*time.Second)
model.Close()
tracker.TimeoutReceive(broker.FinishedGUI, 3*time.Second)
tracker.TimeoutReceive(broker.FinishedSpecAn, 3*time.Second)
},
GetChunkFunc: func(isPreset bool) []byte {
retChn := make(chan []byte)
if !tracker.TrySend(broker.ToModel, tracker.MsgToModel{Data: func() { retChn <- t.MarshalRecovery() }}) {
if !tracker.TrySend(broker.ToModel, tracker.MsgToModel{Data: func() { retChn <- t.History().MarshalRecovery() }}) {
return nil
}
ret, _ := tracker.TimeoutReceive(retChn, 5*time.Second) // ret will be nil if timeout or channel closed
return ret
},
SetChunkFunc: func(data []byte, isPreset bool) {
tracker.TrySend(broker.ToModel, tracker.MsgToModel{Data: func() { t.UnmarshalRecovery(data) }})
tracker.TrySend(broker.ToModel, tracker.MsgToModel{Data: func() { t.History().UnmarshalRecovery(data) }})
},
}