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

refactor(tracker): split NewModelPlayer into NewModel, NewPlayer

Browse Source
This commit is contained in:
5684185+vsariola@users.noreply.github.com 2024-11-02 23:58:38 +02:00
parent 37769fcc9c
commit 8074fd71d3
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,8 @@ func main() {
defer midiContext.Close()
midiContext.TryToOpenBy(*defaultMidiInput, *firstMidiInput)
broker := tracker.NewBroker()
model, player := tracker.NewModelPlayer(broker, cmd.MainSynther, midiContext, recoveryFile)
model := tracker.NewModel(broker, cmd.MainSynther, midiContext, recoveryFile)
player := tracker.NewPlayer(broker, cmd.MainSynther)
detector := tracker.NewDetector(broker)
go detector.Run()

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

@ -75,7 +75,8 @@ func init() {
recoveryFile = filepath.Join(configDir, "sointu", "sointu-vsti-recovery-"+hex.EncodeToString(randBytes))
}
broker := tracker.NewBroker()
model, player := tracker.NewModelPlayer(broker, cmd.MainSynther, NullMIDIContext{}, recoveryFile)
model := tracker.NewModel(broker, cmd.MainSynther, NullMIDIContext{}, recoveryFile)
player := tracker.NewPlayer(broker, cmd.MainSynther)
detector := tracker.NewDetector(broker)
go detector.Run()

12
tracker/model.go
View File

@ -181,7 +181,7 @@ func (m *Model) Quitted() bool { return m.quitted }
func (m *Model) DetectorResult() DetectorResult { return m.detectorResult }
// NewModelPlayer creates a new model and a player that communicates with it
func NewModelPlayer(broker *Broker, synther sointu.Synther, midiContext MIDIContext, recoveryFilePath string) (*Model, *Player) {
func NewModel(broker *Broker, synther sointu.Synther, midiContext MIDIContext, recoveryFilePath string) *Model {
m := new(Model)
m.synther = synther
m.MIDI = midiContext
@ -199,15 +199,9 @@ func NewModelPlayer(broker *Broker, synther sointu.Synther, midiContext MIDICont
}
}
}
trySend(broker.ToPlayer, any(m.d.Song.Copy())) // we should be non-blocking in the constructor
m.signalAnalyzer = NewScopeModel(broker, m.d.Song.BPM)
p := &Player{
broker: broker,
synther: synther,
song: m.d.Song.Copy(),
loop: m.loop,
}
p.compileOrUpdateSynth()
return m, p
return m
}
func (m *Model) change(kind string, t ChangeType, severity ChangeSeverity) func() {

3
tracker/model_test.go
View File

@ -265,7 +265,8 @@ func FuzzModel(f *testing.F) {
reader := bytes.NewReader(slice)
synther := vm.GoSynther{}
broker := tracker.NewBroker()
model, player := tracker.NewModelPlayer(broker, synther, NullContext{}, "")
model := tracker.NewModel(broker, synther, NullContext{}, "")
player := tracker.NewPlayer(broker, synther)
buf := make([][2]float32, 2048)
closeChan := make(chan struct{})
go func() {

7
tracker/player.go
View File

@ -73,6 +73,13 @@ const (
const numRenderTries = 10000
func NewPlayer(broker *Broker, synther sointu.Synther) *Player {
return &Player{
broker: broker,
synther: synther,
}
}
// Process renders audio to the given buffer, trying to fill it completely. If
// the buffer is not filled, the synth is destroyed and an error is sent to the
// model. context tells the player which MIDI events happen during the current