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

2025-07-14 11:04:23 -04:00 · 2021-02-01 18:33:52 +02:00
parent 3cf2fc70a8
commit 3f494661e3
95 changed files with 132 additions and 6 deletions
--- a/bridge/bridge_test.go
+++ b/bridge/bridge_test.go
@ -40,7 +40,7 @@ func TestOscillatSine(t *testing.T) {
 			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}}}}
-	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)
 	if err != nil {
 		t.Fatalf("Compiling patch failed: %v", err)
--- a/cmd/sointu-compile/main.go
+++ b/cmd/sointu-compile/main.go
@ -119,6 +119,9 @@ func main() {
 				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
 		if compile {
 			var err error
--- a/sointu.go
+++ b/sointu.go
@ -257,6 +257,7 @@ var UnitTypes = map[string]([]UnitParameter){
 type Song struct {
 	BPM            int
 	RowsPerPattern int
+	RowsPerBeat    int
 	Tracks         []Track
 	Patch          Patch
 }
@ -266,7 +267,7 @@ func (s *Song) Copy() Song {
 	for i, t := range s.Tracks {
 		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 {
@ -278,7 +279,7 @@ func (s *Song) TotalRows() 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 {
--- a/templates/amd64-386/player.h
+++ b/templates/amd64-386/player.h
@ -7,10 +7,11 @@

 #define SU_SAMPLE_RATE     44100
 #define SU_BPM             {{.Song.BPM}}
+#define SU_ROWS_PER_BEAT  {{.Song.RowsPerBeat}}
 #define SU_PATTERN_SIZE    {{.Song.RowsPerPattern}}
 #define SU_MAX_PATTERNS    {{.Song.SequenceLength}}
 #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>
 #if UINTPTR_MAX == 0xffffffff
--- a/tests/test_add.yml
+++ b/tests/test_add.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_add_stereo.yml
+++ b/tests/test_add_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_addp.yml
+++ b/tests/test_addp.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_addp_stereo.yml
+++ b/tests/test_addp_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_aux.yml
+++ b/tests/test_aux.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_aux_stereo.yml
+++ b/tests/test_aux_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_chords.yml
+++ b/tests/test_chords.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_clip.yml
+++ b/tests/test_clip.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_clip_stereo.yml
+++ b/tests/test_clip_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_compressor.yml
+++ b/tests/test_compressor.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_compressor_stereo.yml
+++ b/tests/test_compressor_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_crush.yml
+++ b/tests/test_crush.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_crush_stereo.yml
+++ b/tests/test_crush_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay.yml
+++ b/tests/test_delay.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_dampmod.yml
+++ b/tests/test_delay_dampmod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_drymod.yml
+++ b/tests/test_delay_drymod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_feedbackmod.yml
+++ b/tests/test_delay_feedbackmod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_flanger.yml
+++ b/tests/test_delay_flanger.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_notetracking.yml
+++ b/tests/test_delay_notetracking.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_pregainmod.yml
+++ b/tests/test_delay_pregainmod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_reverb.yml
+++ b/tests/test_delay_reverb.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_stereo.yml
+++ b/tests/test_delay_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_distort.yml
+++ b/tests/test_distort.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_distort_mod.yml
+++ b/tests/test_distort_mod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_distort_stereo.yml
+++ b/tests/test_distort_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_envelope.yml
+++ b/tests/test_envelope.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_envelope_mod.yml
+++ b/tests/test_envelope_mod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_envelope_stereo.yml
+++ b/tests/test_envelope_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_band.yml
+++ b/tests/test_filter_band.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_freqmod.yml
+++ b/tests/test_filter_freqmod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_high.yml
+++ b/tests/test_filter_high.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_low.yml
+++ b/tests/test_filter_low.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_peak.yml
+++ b/tests/test_filter_peak.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_resmod.yml
+++ b/tests/test_filter_resmod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_stereo.yml
+++ b/tests/test_filter_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_gain.yml
+++ b/tests/test_gain.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_gain_stereo.yml
+++ b/tests/test_gain_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_hold.yml
+++ b/tests/test_hold.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_hold_mod.yml
+++ b/tests/test_hold_mod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_hold_stereo.yml
+++ b/tests/test_hold_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_in.yml
+++ b/tests/test_in.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_in_stereo.yml
+++ b/tests/test_in_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_invgain.yml
+++ b/tests/test_invgain.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_invgain_stereo.yml
+++ b/tests/test_invgain_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_loadnote.yml
+++ b/tests/test_loadnote.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_loadnote_stereo.yml
+++ b/tests/test_loadnote_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_loadval.yml
+++ b/tests/test_loadval.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_loadval_stereo.yml
+++ b/tests/test_loadval_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_mul.yml
+++ b/tests/test_mul.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_mul_stereo.yml
+++ b/tests/test_mul_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_mulp.yml
+++ b/tests/test_mulp.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_mulp_stereo.yml
+++ b/tests/test_mulp_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_multiple_instruments.yml
+++ b/tests/test_multiple_instruments.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_noise.yml
+++ b/tests/test_noise.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_noise_stereo.yml
+++ b/tests/test_noise_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_colormod.yml
+++ b/tests/test_oscillat_colormod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_detunemod.yml
+++ b/tests/test_oscillat_detunemod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_gainmod.yml
+++ b/tests/test_oscillat_gainmod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_gate.yml
+++ b/tests/test_oscillat_gate.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_lfo.yml
+++ b/tests/test_oscillat_lfo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_phasemod.yml
+++ b/tests/test_oscillat_phasemod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_pulse.yml
+++ b/tests/test_oscillat_pulse.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_sample.yml
+++ b/tests/test_oscillat_sample.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 8
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [1, 0, 2, 0, 3, 0, 4, 0]
--- a/tests/test_oscillat_sample_stereo.yml
+++ b/tests/test_oscillat_sample_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 8
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [1, 0, 2, 0, 3, 0, 4, 0]
--- a/tests/test_oscillat_shapemod.yml
+++ b/tests/test_oscillat_shapemod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_sine.yml
+++ b/tests/test_oscillat_sine.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_stereo.yml
+++ b/tests/test_oscillat_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_transposemod.yml
+++ b/tests/test_oscillat_transposemod.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_trisaw.yml
+++ b/tests/test_oscillat_trisaw.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_unison.yml
+++ b/tests/test_oscillat_unison.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_unison_stereo.yml
+++ b/tests/test_oscillat_unison_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_outaux.yml
+++ b/tests/test_outaux.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_outaux_stereo.yml
+++ b/tests/test_outaux_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_panning.yml
+++ b/tests/test_panning.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_panning_stereo.yml
+++ b/tests/test_panning_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_polyphony.yml
+++ b/tests/test_polyphony.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 2
      sequence: [0]
--- a/tests/test_pop.yml
+++ b/tests/test_pop.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_pop_stereo.yml
+++ b/tests/test_pop_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_push.yml
+++ b/tests/test_push.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_push_stereo.yml
+++ b/tests/test_push_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_receive.yml
+++ b/tests/test_receive.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_receive_stereo.yml
+++ b/tests/test_receive_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_send.yml
+++ b/tests/test_send.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_send_global.yml
+++ b/tests/test_send_global.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_send_stereo.yml
+++ b/tests/test_send_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_speed.yml
+++ b/tests/test_speed.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0, 0]
--- a/tests/test_xch.yml
+++ b/tests/test_xch.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_xch_stereo.yml
+++ b/tests/test_xch_stereo.yml
@ -1,5 +1,6 @@
 bpm: 100
 rowsperpattern: 16
+rowsperbeat: 4
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tracker/defaultsong.go
+++ b/tracker/defaultsong.go
@ -15,6 +15,7 @@ var defaultInstrument = sointu.Instrument{
 var defaultSong = sointu.Song{
 	BPM:            100,
 	RowsPerPattern: 16,
+	RowsPerBeat:    4,
 	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{{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}}},
--- a/tracker/songpanel.go
+++ b/tracker/songpanel.go
@ -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
+				}),
+			)
+		}),
 	)
 }
--- a/tracker/tracker.go
+++ b/tracker/tracker.go
@ -30,6 +30,7 @@ type Tracker struct {
 	Octave                *NumberInput
 	BPM                   *NumberInput
 	RowsPerPattern        *NumberInput
+	RowsPerBeat           *NumberInput
 	NewTrackBtn           *widget.Clickable
 	NewInstrumentBtn      *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")
 	}
 	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()
 		if !t.Playing {
 			t.playRowPatMutex.Unlock()
@ -172,7 +173,23 @@ func (t *Tracker) SetBPM(value int) bool {
 	if value != int(t.song.BPM) {
 		t.SaveUndo()
 		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 false
@ -362,6 +379,7 @@ func New(audioContext sointu.AudioContext) *Tracker {
 		Octave:                new(NumberInput),
 		SongLength:            new(NumberInput),
 		RowsPerPattern:        new(NumberInput),
+		RowsPerBeat:           new(NumberInput),
 		NewTrackBtn:           new(widget.Clickable),
 		NewInstrumentBtn:      new(widget.Clickable),
 		DeleteInstrumentBtn:   new(widget.Clickable),