diff --git a/go.mod b/go.mod index fa1d0fa..db278bb 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,14 @@ go 1.14 require ( github.com/eiannone/keyboard v0.0.0-20200508000154-caf4b762e807 github.com/faiface/beep v1.0.2 + github.com/gin-gonic/gin v1.6.3 github.com/kbinani/midi v0.0.0-20170127113123-ce7c305abe3b github.com/kr/pretty v0.2.1 github.com/schollz/logger v1.2.0 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 + github.com/stretchr/testify v1.6.1 + gitlab.com/gomidi/midi v1.19.3 + gitlab.com/gomidi/rtmididrv v0.10.1 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1 // indirect + gopkg.in/music-theory.v0 v0.0.4 ) diff --git a/go.sum b/go.sum index 286f103..1ba5e82 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,26 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/eiannone/keyboard v0.0.0-20200508000154-caf4b762e807 h1:jdjd5e68T4R/j4PWxfZqcKY8KtT9oo8IPNVuV4bSXDQ= github.com/eiannone/keyboard v0.0.0-20200508000154-caf4b762e807/go.mod h1:Xoiu5VdKMvbRgHuY7+z64lhu/7lvax/22nzASF6GrO8= github.com/faiface/beep v1.0.2 h1:UB5DiRNmA4erfUYnHbgU4UB6DlBOrsdEFRtcc8sCkdQ= github.com/faiface/beep v1.0.2/go.mod h1:1yLb5yRdHMsovYYWVqYLioXkVuziCSITW1oarTeduQM= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= github.com/gdamore/tcell v1.1.1/go.mod h1:K1udHkiR3cOtlpKG5tZPD5XxrF7v2y7lDq7Whcj+xkQ= +github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= +github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= +github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= +github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= +github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= +github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= +github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= +github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= +github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gopherjs/gopherjs v0.0.0-20180628210949-0892b62f0d9f/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20180825215210-0210a2f0f73c/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherwasm v0.1.1/go.mod h1:kx4n9a+MzHH0BJJhvlsQ65hqLFXDO/m256AsaDPQ+/4= @@ -14,6 +31,7 @@ github.com/hajimehoshi/oto v0.3.1 h1:cpf/uIv4Q0oc5uf9loQn7PIehv+mZerh+0KKma6gzMk github.com/hajimehoshi/oto v0.3.1/go.mod h1:e9eTLBB9iZto045HLbzfHJIc+jP3xaKrjZTghvb6fdM= github.com/jfreymuth/oggvorbis v1.0.0/go.mod h1:abe6F9QRjuU9l+2jek3gj46lu40N4qlYxh2grqkLEDM= github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/kbinani/midi v0.0.0-20170127113123-ce7c305abe3b h1:SiC72wWDbNIK1Ve6NolEJP4DmTI5+Mv33GltPaZr9JY= github.com/kbinani/midi v0.0.0-20170127113123-ce7c305abe3b/go.mod h1:WH67eI/UR97EkhNJLfo5PR9mxrd62C8rfdPfYmdpnlU= github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= @@ -21,20 +39,55 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= +github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4= +github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mewkiz/flac v1.0.5/go.mod h1:EHZNU32dMF6alpurYyKHDLYpW1lYpBZ5WrXi/VuNIGs= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/schollz/logger v1.2.0 h1:5WXfINRs3lEUTCZ7YXhj0uN+qukjizvITLm3Ca2m0Ho= github.com/schollz/logger v1.2.0/go.mod h1:P6F4/dGMGcx8wh+kG1zrNEd4vnNpEBY/mwEMd/vn6AM= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +gitlab.com/gomidi/midi v1.16.4/go.mod h1:3ohtNOhqoSakkuLG/Li1OI6I3J1c2LErnJF5o/VBq1c= +gitlab.com/gomidi/midi v1.19.3 h1:31nhd1opE1cqyVd1poszlYoMNTsAdmTYea+tT+PLFd8= +gitlab.com/gomidi/midi v1.19.3/go.mod h1:3ohtNOhqoSakkuLG/Li1OI6I3J1c2LErnJF5o/VBq1c= +gitlab.com/gomidi/rtmididrv v0.10.1 h1:BgqhFpBgythJqFbiR8QtL3CER1nh26YCUPFGVidS9gk= +gitlab.com/gomidi/rtmididrv v0.10.1/go.mod h1:sBxBDsJKVhinLt+kk7fj6WfKRCmnFzFSkFY1chDNLbw= +gitlab.com/gomidi/rtmididrv/imported/rtmidi v0.0.0-20191025100939-514fe0ed97a6 h1:0XqAH/BAxH5TTBzIWkdlZqpp6VUx6DFcQnMWW6G6hIc= +gitlab.com/gomidi/rtmididrv/imported/rtmidi v0.0.0-20191025100939-514fe0ed97a6/go.mod h1:FYVFN2H23IsX56VntiDF9DgCIekHh359wW+iMl1W8rQ= golang.org/x/exp v0.0.0-20180710024300-14dda7b62fcd/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/mobile v0.0.0-20180806140643-507816974b79/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/sys v0.0.0-20181228144115-9a3f9b0469bb/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1 h1:sIky/MyNRSHTrdxfsiUSS4WIAMvInbeXljJz+jDjeYE= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/music-theory.v0 v0.0.4 h1:jPFzLqiemBaS+cYeAev13xugjfG4fnj0fGCSu45EFHs= +gopkg.in/music-theory.v0 v0.0.4/go.mod h1:a4I2+38r3WV3OBcrcv5dA7v4Dtw+WCWj1XeBkvCmUXE= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index e26bac9..ce11339 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ func init() { flag.BoolVar(&flagVersion, "version", false, "show version") flag.BoolVar(&flagWait, "sync", false, "wait for midi input to start") flag.BoolVar(&flagClick, "click", false, "output click track with metronome") - flag.Int64Var(&flagLatency, "latency", 2000, "latency for midi output") + flag.Int64Var(&flagLatency, "latency", 10, "latency for midi output") flag.Int64Var(&click.TuneLatency, "clicklag", 0, "add lag to click track to sync better") flag.Float64Var(&sequencer.ClickPerQuarterNote, "clickperqn", 2, "number of clicks per quarter note") flag.StringVar(&flagRecord, "record", "", "record input to miti file") diff --git a/src/play/play.go b/src/play/play.go index b96ba90..0848f2b 100644 --- a/src/play/play.go +++ b/src/play/play.go @@ -13,8 +13,8 @@ import ( "github.com/schollz/miti/src/sequencer" "github.com/skratchdot/open-golang/open" - // midi "github.com/schollz/miti/src/rtmidi" // use rtmidi instead - midi "github.com/schollz/miti/src/midi" + midi "github.com/schollz/miti/src/rtmidi" // use rtmidi instead + // midi "github.com/schollz/miti/src/midi" ) var Version string @@ -158,6 +158,7 @@ E B G E B G E B G E B G err = errR return } + fmt.Println("waiting for keypress to initiate") for { e := <-events if !e.On { diff --git a/src/record/record.go b/src/record/record.go index 0d2ea5a..86c31e0 100644 --- a/src/record/record.go +++ b/src/record/record.go @@ -8,8 +8,10 @@ import ( "github.com/eiannone/keyboard" "github.com/schollz/miti/src/log" - "github.com/schollz/miti/src/midi" + "github.com/schollz/miti/src/music" + midi "github.com/schollz/miti/src/rtmidi" // use rtmidi instead + // midi "github.com/schollz/miti/src/midi" ) func Record(fname string) (err error) { @@ -33,7 +35,7 @@ func Record(fname string) (err error) { currentState := "" previousNote := music.NewNote("C", 4) go func() { - ticker := time.NewTicker(500 * time.Millisecond) + ticker := time.NewTicker(400 * time.Millisecond) notes := []midi.Event{} for { select { @@ -61,12 +63,12 @@ func Record(fname string) (err error) { for _, e := range notes { log.Debugf("e: %+v", e) note := music.MidiToNote(e.MIDI) - closestNote := music.ClosestNote(note.Name, previousNote) - if closestNote.Octave == note.Octave { - currentState += fmt.Sprintf("%s", note.Name) - } else { - currentState += fmt.Sprintf("%s%d", note.Name, note.Octave) - } + // closestNote := music.ClosestNote(note.Name, previousNote) + // if closestNote.Octave == note.Octave { + // currentState += fmt.Sprintf("%s", note.Name) + // } else { + currentState += fmt.Sprintf("%s%d", note.Name, note.Octave) + // } previousNote = note } currentState += " " diff --git a/src/rtmidi/midiin.go b/src/rtmidi/midiin.go new file mode 100644 index 0000000..a410576 --- /dev/null +++ b/src/rtmidi/midiin.go @@ -0,0 +1,60 @@ +package rtmidi + +import ( + "time" + + "github.com/schollz/miti/src/log" + driver "gitlab.com/gomidi/rtmididrv" +) + +type Event struct { + MIDI int + On bool + Instrument string + Timestamp time.Time +} + +func ReadAll(finished chan bool) (events chan Event, err error) { + events = make(chan Event, 100) + if !inited { + drv, err = driver.New() + if err != nil { + return + } + inited = true + } + + ins, err := drv.Ins() + if err != nil { + return + } + + for i := range ins { + err = ins[i].Open() + if err != nil { + log.Error(err) + continue + } + func(j int) { + name := ins[j].String() + log.Tracef("setting up %s", name) + ins[j].SetListener(func(data []byte, deltaMicroseconds int64) { + if len(data) == 3 { + log.Tracef("[%s] %+v", name, data) + events <- Event{int(data[1]), data[0] == 144, name, time.Now()} + } + }) + }(i) + + } + go func() { + <-finished + for i := range ins { + log.Debugf("[%s] closing midi input", ins[i].String()) + ins[i].StopListening() + ins[i].Close() + } + }() + + return +} diff --git a/src/rtmidi/rtmidi.go b/src/rtmidi/rtmidi.go index d15acec..df5ccbb 100644 --- a/src/rtmidi/rtmidi.go +++ b/src/rtmidi/rtmidi.go @@ -4,7 +4,6 @@ import ( "fmt" "strings" "sync" - "time" "github.com/schollz/miti/src/log" "github.com/schollz/miti/src/music" @@ -48,6 +47,7 @@ func Init() (devices []string, err error) { outputChannelsMap = make(map[string]int) outputChannelsMapMatch = make(map[string]int) + var wg sync.WaitGroup for _, out := range outs { log.Debugf("device: %s", out.String()) devices = append(devices, out.String()) @@ -55,12 +55,14 @@ func Init() (devices []string, err error) { outputChannelsMap[out.String()] = len(outputChannels) outputChannels = append(outputChannels, make(chan music.Chord, 1000)) // create a go-routine for each instrument + wg.Add(1) go func(instrument string, channelNum int, midio midi.Out) { log.Debugf("[%s] opening stream", instrument) err := midio.Open() if err != nil { panic(err) } + wg.Done() log.Debugf("[%s] making writer", instrument) wr := writer.New(midio) log.Debugf("[%s] opened stream", instrument) @@ -78,6 +80,7 @@ func Init() (devices []string, err error) { channelLock.Lock() for note := range notesOn { if notesOn[note] { + log.Tracef("turning %+v off", note) writer.NoteOff(wr, uint8(note)) } } @@ -85,10 +88,10 @@ func Init() (devices []string, err error) { // shutdown midio.Close() channelLock.Unlock() - go func() { - time.Sleep(50 * time.Millisecond) - drv.Close() - }() + // go func() { + // time.Sleep(50 * time.Millisecond) + // drv.Close() + // }() return } channelLock.Unlock() @@ -113,8 +116,7 @@ func Init() (devices []string, err error) { } }(out.String(), len(outputChannels)-1, out) } - time.Sleep(3 * time.Second) - + wg.Wait() return }