mirror/sointu
1
0
Fork 0
mirror of https://github.com/vsariola/sointu.git synced 2025-10-31 07:54:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tracker): Rewrote the sequencer loop to use simple mutex

Browse Source
This commit is contained in:
Veikko Sariola
2020-12-29 16:30:44 +02:00
parent 8029dbd1a8
commit cd498e775b
14 changed files with 315 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/sointu-play/main.go
View File

@ -15,8 +15,8 @@ import (
"gopkg.in/yaml.v3"
"github.com/vsariola/sointu"
"github.com/vsariola/sointu/audio/oto"
"github.com/vsariola/sointu/bridge"
"github.com/vsariola/sointu/oto"
)
func main() {
@ -39,6 +39,15 @@ func main() {
if !*rawOut && !*wavOut {
*play = true // if the user gives nothing to output, then the default behaviour is just to play the file
}
var audioContext sointu.AudioContext
if *play {
audioContext, err := oto.NewContext()
if err != nil {
fmt.Fprintf(os.Stderr, "could not acquire oto AudioContext: %v\n", err)
os.Exit(1)
}
defer audioContext.Close()
}
process := func(filename string) error {
output := func(extension string, contents []byte) error {
if *stdout {
@ -81,12 +90,9 @@ func main() {
return fmt.Errorf("sointu.Play failed: %v", err)
}
if *play {
player, err := oto.NewPlayer()
if err != nil {
return fmt.Errorf("error creating oto player: %v", err)
}
defer player.Close()
if err := player.Play(buffer); err != nil {
output := audioContext.Output()
defer output.Close()
if err := output.WriteAudio(buffer); err != nil {
return fmt.Errorf("error playing: %v", err)
}
}

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

@ -2,26 +2,27 @@ package main
import (
"fmt"
"os"
"gioui.org/app"
"gioui.org/unit"
"github.com/vsariola/sointu/audio/oto"
"github.com/vsariola/sointu/oto"
"github.com/vsariola/sointu/tracker"
"os"
)
func main() {
plr, err := oto.NewPlayer()
audioContext, err := oto.NewContext()
if err != nil {
fmt.Println(err)
os.Exit(1)
}
defer plr.Close()
defer audioContext.Close()
go func() {
w := app.NewWindow(
app.Size(unit.Dp(800), unit.Dp(600)),
app.Title("Sointu Tracker"),
)
t := tracker.New(plr)
t := tracker.New(audioContext)
defer t.Close()
if err := t.Run(w); err != nil {
fmt.Println(err)