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

feat(sointu): add RowsPerBeat so non-power of 2 beat divisions are easier

Browse Source
This commit is contained in:
vsariola
2021-02-01 18:33:52 +02:00
parent 3cf2fc70a8
commit 3f494661e3
95 changed files with 132 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/bridge_test.go
View File

@ -40,7 +40,7 @@ func TestOscillatSine(t *testing.T) {
sointu.Unit{Type: "out", Parameters: map[string]int{"stereo": 1, "gain": 128}}, sointu.Unit{Type: "out", Parameters: map[string]int{"stereo": 1, "gain": 128}},
}}}} }}}}
tracks := []sointu.Track{{NumVoices: 1, Sequence: []byte{0}, Patterns: [][]byte{{64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0}}}} tracks := []sointu.Track{{NumVoices: 1, Sequence: []byte{0}, Patterns: [][]byte{{64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0}}}}
song := sointu.Song{BPM: 100, RowsPerPattern: 16, Tracks: tracks, Patch: patch} song := sointu.Song{BPM: 100, RowsPerPattern: 16, RowsPerBeat: 4, Tracks: tracks, Patch: patch}
synth, err := bridge.Synth(patch) synth, err := bridge.Synth(patch)
if err != nil { if err != nil {
t.Fatalf("Compiling patch failed: %v", err) t.Fatalf("Compiling patch failed: %v", err)

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

@ -119,6 +119,9 @@ func main() {
return fmt.Errorf("song could not be unmarshaled as a .json (%v) or .yml (%v)", errJSON, errYaml) return fmt.Errorf("song could not be unmarshaled as a .json (%v) or .yml (%v)", errJSON, errYaml)
} }
} }
if song.RowsPerBeat == 0 {
song.RowsPerBeat = 4
}
var compiledPlayer map[string]string var compiledPlayer map[string]string
if compile { if compile {
var err error var err error

5
sointu.go
View File

@ -257,6 +257,7 @@ var UnitTypes = map[string]([]UnitParameter){
type Song struct { type Song struct {
BPM int BPM int
RowsPerPattern int RowsPerPattern int
RowsPerBeat int
Tracks []Track Tracks []Track
Patch Patch Patch Patch
} }
@ -266,7 +267,7 @@ func (s *Song) Copy() Song {
for i, t := range s.Tracks { for i, t := range s.Tracks {
tracks[i] = t.Copy() tracks[i] = t.Copy()
} }
return Song{BPM: s.BPM, RowsPerPattern: s.RowsPerPattern, Tracks: tracks, Patch: s.Patch.Copy()} return Song{BPM: s.BPM, RowsPerPattern: s.RowsPerPattern, RowsPerBeat: s.RowsPerBeat, Tracks: tracks, Patch: s.Patch.Copy()}
} }
func (s *Song) SequenceLength() int { func (s *Song) SequenceLength() int {
@ -278,7 +279,7 @@ func (s *Song) TotalRows() int {
} }
func (s *Song) SamplesPerRow() int { func (s *Song) SamplesPerRow() int {
return 44100 * 60 / (s.BPM * 4) return 44100 * 60 / (s.BPM * s.RowsPerBeat)
} }
func (s *Song) FirstTrackVoice(track int) int { func (s *Song) FirstTrackVoice(track int) int {

3
templates/amd64-386/player.h
View File

@ -7,10 +7,11 @@
#define SU_SAMPLE_RATE 44100 #define SU_SAMPLE_RATE 44100
#define SU_BPM {{.Song.BPM}} #define SU_BPM {{.Song.BPM}}
#define SU_ROWS_PER_BEAT {{.Song.RowsPerBeat}}
#define SU_PATTERN_SIZE {{.Song.RowsPerPattern}} #define SU_PATTERN_SIZE {{.Song.RowsPerPattern}}
#define SU_MAX_PATTERNS {{.Song.SequenceLength}} #define SU_MAX_PATTERNS {{.Song.SequenceLength}}
#define SU_TOTAL_ROWS (SU_MAX_PATTERNS*SU_PATTERN_SIZE) #define SU_TOTAL_ROWS (SU_MAX_PATTERNS*SU_PATTERN_SIZE)
#define SU_SAMPLES_PER_ROW (SU_SAMPLE_RATE*4*60/(SU_BPM*16)) #define SU_SAMPLES_PER_ROW (SU_SAMPLE_RATE*60/(SU_BPM*SU_ROWS_PER_BEAT))
#include <stdint.h> #include <stdint.h>
#if UINTPTR_MAX == 0xffffffff #if UINTPTR_MAX == 0xffffffff

1
tests/test_add.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_add_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_addp.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_addp_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_aux.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_aux_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_chords.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_clip.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_clip_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_compressor.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_compressor_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_crush.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_crush_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_delay.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_delay_dampmod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_delay_drymod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_delay_feedbackmod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_delay_flanger.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_delay_notetracking.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_delay_pregainmod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_delay_reverb.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_delay_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_distort.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_distort_mod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_distort_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_envelope.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_envelope_mod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_envelope_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_filter_band.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_filter_freqmod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_filter_high.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_filter_low.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_filter_peak.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_filter_resmod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_filter_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_gain.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_gain_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_hold.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_hold_mod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_hold_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_in.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_in_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_invgain.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_invgain_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_loadnote.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_loadnote_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_loadval.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_loadval_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_mul.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_mul_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_mulp.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_mulp_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_multiple_instruments.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_noise.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_noise_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_colormod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_detunemod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_gainmod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_gate.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_lfo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_phasemod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_pulse.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_sample.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 8 rowsperpattern: 8
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [1, 0, 2, 0, 3, 0, 4, 0] sequence: [1, 0, 2, 0, 3, 0, 4, 0]

1
tests/test_oscillat_sample_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 8 rowsperpattern: 8
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [1, 0, 2, 0, 3, 0, 4, 0] sequence: [1, 0, 2, 0, 3, 0, 4, 0]

1
tests/test_oscillat_shapemod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_sine.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_transposemod.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_trisaw.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_unison.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_oscillat_unison_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_outaux.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_outaux_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_panning.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_panning_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_polyphony.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 2 - numvoices: 2
sequence: [0] sequence: [0]

1
tests/test_pop.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_pop_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_push.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_push_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_receive.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_receive_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_send.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_send_global.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_send_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_speed.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0, 0] sequence: [0, 0]

1
tests/test_xch.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tests/test_xch_stereo.yml
View File

@ -1,5 +1,6 @@
bpm: 100 bpm: 100
rowsperpattern: 16 rowsperpattern: 16
rowsperbeat: 4
tracks: tracks:
- numvoices: 1 - numvoices: 1
sequence: [0] sequence: [0]

1
tracker/defaultsong.go
View File

@ -15,6 +15,7 @@ var defaultInstrument = sointu.Instrument{
var defaultSong = sointu.Song{ var defaultSong = sointu.Song{
BPM: 100, BPM: 100,
RowsPerPattern: 16, RowsPerPattern: 16,
RowsPerBeat: 4,
Tracks: []sointu.Track{ Tracks: []sointu.Track{
{NumVoices: 2, Sequence: []byte{0, 0, 0, 1}, Patterns: [][]byte{{64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0}, {64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 75, 0, 75, 0, 80, 0}}}, {NumVoices: 2, Sequence: []byte{0, 0, 0, 1}, Patterns: [][]byte{{64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0}, {64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 75, 0, 75, 0, 80, 0}}},
{NumVoices: 2, Sequence: []byte{0, 0, 0, 1}, Patterns: [][]byte{{0, 0, 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0}, {32, 0, 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 68, 0, 68, 0}}}, {NumVoices: 2, Sequence: []byte{0, 0, 0, 1}, Patterns: [][]byte{{0, 0, 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0}, {32, 0, 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 68, 0, 68, 0}}},

14
tracker/songpanel.go
View File

@ -110,5 +110,19 @@ func (t *Tracker) layoutSongOptions(gtx C) D {
}), }),
) )
}), }),
layout.Rigid(func(gtx C) D {
return layout.Flex{Axis: layout.Horizontal}.Layout(gtx,
layout.Rigid(Label("RPB:", white)),
layout.Rigid(func(gtx layout.Context) layout.Dimensions {
t.RowsPerBeat.Value = t.song.RowsPerBeat
numStyle := NumericUpDown(t.Theme, t.RowsPerBeat, 1, 32)
gtx.Constraints.Min.Y = gtx.Px(unit.Dp(20))
gtx.Constraints.Min.X = gtx.Px(unit.Dp(70))
dims := in.Layout(gtx, numStyle.Layout)
t.SetRowsPerBeat(t.RowsPerBeat.Value)
return dims
}),
)
}),
) )
} }

22
tracker/tracker.go
View File

@ -30,6 +30,7 @@ type Tracker struct {
Octave *NumberInput Octave *NumberInput
BPM *NumberInput BPM *NumberInput
RowsPerPattern *NumberInput RowsPerPattern *NumberInput
RowsPerBeat *NumberInput
NewTrackBtn *widget.Clickable NewTrackBtn *widget.Clickable
NewInstrumentBtn *widget.Clickable NewInstrumentBtn *widget.Clickable
DeleteInstrumentBtn *widget.Clickable DeleteInstrumentBtn *widget.Clickable
@ -102,7 +103,7 @@ func (t *Tracker) sequencerLoop(closer <-chan struct{}) {
panic("cannot create a synth with the default patch") panic("cannot create a synth with the default patch")
} }
curVoices := make([]int, 32) curVoices := make([]int, 32)
t.sequencer = NewSequencer(synth, 44100*60/(4*t.song.BPM), func() ([]Note, bool) { t.sequencer = NewSequencer(synth, t.song.SamplesPerRow(), func() ([]Note, bool) {
t.playRowPatMutex.Lock() t.playRowPatMutex.Lock()
if !t.Playing { if !t.Playing {
t.playRowPatMutex.Unlock() t.playRowPatMutex.Unlock()
@ -172,7 +173,23 @@ func (t *Tracker) SetBPM(value int) bool {
if value != int(t.song.BPM) { if value != int(t.song.BPM) {
t.SaveUndo() t.SaveUndo()
t.song.BPM = value t.song.BPM = value
t.sequencer.SetRowLength(44100 * 60 / (4 * t.song.BPM)) t.sequencer.SetRowLength(t.song.SamplesPerRow())
return true
}
return false
}
func (t *Tracker) SetRowsPerBeat(value int) bool {
if value < 1 {
value = 1
}
if value > 32 {
value = 32
}
if value != int(t.song.RowsPerBeat) {
t.SaveUndo()
t.song.RowsPerBeat = value
t.sequencer.SetRowLength(t.song.SamplesPerRow())
return true return true
} }
return false return false
@ -362,6 +379,7 @@ func New(audioContext sointu.AudioContext) *Tracker {
Octave: new(NumberInput), Octave: new(NumberInput),
SongLength: new(NumberInput), SongLength: new(NumberInput),
RowsPerPattern: new(NumberInput), RowsPerPattern: new(NumberInput),
RowsPerBeat: new(NumberInput),
NewTrackBtn: new(widget.Clickable), NewTrackBtn: new(widget.Clickable),
NewInstrumentBtn: new(widget.Clickable), NewInstrumentBtn: new(widget.Clickable),
DeleteInstrumentBtn: new(widget.Clickable), DeleteInstrumentBtn: new(widget.Clickable),