From dc88b885e9de6f219032454729f57e986c7bee17 Mon Sep 17 00:00:00 2001 From: Veikko Sariola Date: Mon, 2 Nov 2020 22:31:22 +0200 Subject: [PATCH] Fix warnings when built using nasm. Nasm gives warnings about labels without colons in the end; these were particularly prevalent in struc members: ".size" has be ".size:". Nasm also wasn't happy with extra trailing commas when calling macros. --- README.md | 7 ++++--- include/sointu/effects_header.inc | 2 +- include/sointu/footer.inc | 8 ++++---- include/sointu/header.inc | 8 ++++---- include/sointu/sources_footer.inc | 2 +- include/sointu/win32/gmdls_win32_footer.inc | 4 +++- include/sointu/win64/gmdls_win64_footer.inc | 4 +++- tests/test_add.asm | 2 +- tests/test_add_stereo.asm | 2 +- tests/test_chords.asm | 6 +++--- tests/test_clip.asm | 2 +- tests/test_clip_stereo.asm | 2 +- tests/test_compressor.asm | 4 ++-- tests/test_compressor_stereo.asm | 4 ++-- tests/test_crush.asm | 2 +- tests/test_crush_stereo.asm | 2 +- tests/test_delay.asm | 2 +- tests/test_delay_dampmod.asm | 2 +- tests/test_delay_drymod.asm | 2 +- tests/test_delay_feedbackmod.asm | 2 +- tests/test_delay_notetracking.asm | 2 +- tests/test_delay_pregainmod.asm | 2 +- tests/test_delay_reverb.asm | 2 +- tests/test_delay_stereo.asm | 2 +- tests/test_envelope_mod.asm | 2 +- tests/test_filter_band.asm | 2 +- tests/test_filter_freqmod.asm | 2 +- tests/test_filter_high.asm | 2 +- tests/test_filter_low.asm | 2 +- tests/test_filter_peak.asm | 2 +- tests/test_filter_resmod.asm | 2 +- tests/test_filter_stereo.asm | 2 +- tests/test_multiple_instruments.asm | 4 ++-- tests/test_noise.asm | 2 +- tests/test_noise_stereo.asm | 2 +- tests/test_oscillat_gate.asm | 2 +- tests/test_oscillat_lfo.asm | 2 +- tests/test_oscillat_pulse.asm | 2 +- tests/test_oscillat_sample.asm | 10 +++++----- tests/test_oscillat_sample_stereo.asm | 10 +++++----- tests/test_oscillat_sine.asm | 2 +- tests/test_oscillat_stereo.asm | 2 +- tests/test_oscillat_trisaw.asm | 2 +- tests/test_oscillat_unison.asm | 2 +- tests/test_oscillat_unison_stereo.asm | 2 +- tests/test_polyphony.asm | 2 +- tests/test_speed.asm | 6 +++--- 47 files changed, 75 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index 61a7330..f53c879 100644 --- a/README.md +++ b/README.md @@ -17,9 +17,10 @@ even saving some bytes in the process. Building -------- -Requires [CMake](https://cmake.org), [yasm](https://yasm.tortall.net), and -your favorite c-compiler & build tool. Results have been obtained using Visual -Studio 2019, gcc&make on linux, and MinGW&mingw32-make. +Requires [CMake](https://cmake.org), [nasm](https://www.nasm.us/) or +[yasm](https://yasm.tortall.net), and your favorite c-compiler & build tool. +Results have been obtained using Visual Studio 2019, gcc&make on linux, and +MinGW&mingw32-make. ### Example: building and testing using MinGW32 diff --git a/include/sointu/effects_header.inc b/include/sointu/effects_header.inc index df799da..bcb76d8 100644 --- a/include/sointu/effects_header.inc +++ b/include/sointu/effects_header.inc @@ -334,7 +334,7 @@ struc su_delayline_wrk .dcout resd 1 .filtstate resd 1 .buffer resd MAX_DELAY - .size + .size: endstruc ;------------------------------------------------------------------------------- diff --git a/include/sointu/footer.inc b/include/sointu/footer.inc index a3d98ae..8593720 100644 --- a/include/sointu/footer.inc +++ b/include/sointu/footer.inc @@ -141,16 +141,16 @@ struc su_stack ; the structure of stack _as the units see it_ %ifdef INCLUDE_POLYPHONY .polyphony RESPTR 1 %endif - .output_sound + .output_sound: .rowtick RESPTR 1 ; which tick within this row are we at - .update_voices + .update_voices: .row RESPTR 1 ; which total row of the song are we at .tick RESPTR 1 ; which total tick of the song are we at .randseed RESPTR 1 %ifdef INCLUDE_MULTIVOICE_TRACKS .voicetrack RESPTR 1 %endif - .render_epilogue + .render_epilogue: %if BITS == 32 RESPTR 8 ; registers .retaddr_pl RESPTR 1 @@ -160,7 +160,7 @@ struc su_stack ; the structure of stack _as the units see it_ RESPTR 2 ; registers %endif .bufferptr RESPTR 1 - .size + .size: endstruc ;=============================================================================== diff --git a/include/sointu/header.inc b/include/sointu/header.inc index ee19473..e0963bb 100644 --- a/include/sointu/header.inc +++ b/include/sointu/header.inc @@ -6,7 +6,7 @@ %macro EXPORT 1 global %1 - %1 + %1: %endmacro %ifidn __OUTPUT_FORMAT__,win32 @@ -235,7 +235,7 @@ section .text ; yasm throws section redeclaration warnings if strucs are defined struc su_unit .state resd 8 .ports resd 8 - .size + .size: endstruc ;------------------------------------------------------------------------------- @@ -247,7 +247,7 @@ struc su_voice .inputs resd 8 .reserved resd 6 ; this is done to so the whole voice is 2^n long, see polyphonic player .workspace resb MAX_UNITS * su_unit.size - .size + .size: endstruc ;------------------------------------------------------------------------------- @@ -259,7 +259,7 @@ struc su_synthworkspace .right resd 1 .aux resd 6 ; 3 auxiliary signals .voices resb ABSOLUTE_MAX_VOICES * su_voice.size - .size + .size: endstruc %endif ; SOINTU_INC diff --git a/include/sointu/sources_footer.inc b/include/sointu/sources_footer.inc index 8430aac..5bad76a 100644 --- a/include/sointu/sources_footer.inc +++ b/include/sointu/sources_footer.inc @@ -260,7 +260,7 @@ su_oscillat_sine: fstp st1 fsub st0, st0 ; // 0 ret -su_oscillat_sine_do +su_oscillat_sine_do: fdivp st1, st0 ; // p/c fldpi ; // pi p fadd st0 ; // 2*pi p diff --git a/include/sointu/win32/gmdls_win32_footer.inc b/include/sointu/win32/gmdls_win32_footer.inc index 429f606..f8098a6 100644 --- a/include/sointu/win32/gmdls_win32_footer.inc +++ b/include/sointu/win32/gmdls_win32_footer.inc @@ -34,6 +34,8 @@ su_gmdls_path2: db 'drivers/etc/gm.dls',0 SECT_BSS(susamtbl) - EXPORT MANGLE_DATA(su_sample_table) resb SAMPLE_TABLE_SIZE ; size of gmdls. + +EXPORT MANGLE_DATA(su_sample_table) + resb SAMPLE_TABLE_SIZE ; size of gmdls. %endif \ No newline at end of file diff --git a/include/sointu/win64/gmdls_win64_footer.inc b/include/sointu/win64/gmdls_win64_footer.inc index 11f7eae..844fb38 100644 --- a/include/sointu/win64/gmdls_win64_footer.inc +++ b/include/sointu/win64/gmdls_win64_footer.inc @@ -38,6 +38,8 @@ su_gmdls_path2: db 'drivers/etc/gm.dls',0 SECT_BSS(susamtbl) - EXPORT MANGLE_DATA(su_sample_table) resb SAMPLE_TABLE_SIZE ; size of gmdls. + +EXPORT MANGLE_DATA(su_sample_table) + resb SAMPLE_TABLE_SIZE ; size of gmdls. %endif \ No newline at end of file diff --git a/tests/test_add.asm b/tests/test_add.asm index 9c6ea15..9d3b43e 100644 --- a/tests/test_add.asm +++ b/tests/test_add.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0, + PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_add_stereo.asm b/tests/test_add_stereo.asm index c3064a0..47caf8b 100644 --- a/tests/test_add_stereo.asm +++ b/tests/test_add_stereo.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0, + PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_chords.asm b/tests/test_chords.asm index a71b50d..a101138 100644 --- a/tests/test_chords.asm +++ b/tests/test_chords.asm @@ -3,9 +3,9 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 0, 0, 68, 0, 0, 0, 66, 0, 0, 0, 69, 0, 0, 0, - PATTERN 0, 68, 0, 0, 71, 0, 0, 0, 69, 0, 0, 0, 73, 0, 0, 0, - PATTERN 0, 0, 71, 0, 75, 0, 0, 0, 73, 0, 0, 0, 76, 0, 0, 0, + PATTERN 64, 0, 0, 0, 68, 0, 0, 0, 66, 0, 0, 0, 69, 0, 0, 0 + PATTERN 0, 68, 0, 0, 71, 0, 0, 0, 69, 0, 0, 0, 73, 0, 0, 0 + PATTERN 0, 0, 71, 0, 75, 0, 0, 0, 73, 0, 0, 0, 76, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_clip.asm b/tests/test_clip.asm index 3835b05..3c78f3f 100644 --- a/tests/test_clip.asm +++ b/tests/test_clip.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_clip_stereo.asm b/tests/test_clip_stereo.asm index 5209bf7..5eef286 100644 --- a/tests/test_clip_stereo.asm +++ b/tests/test_clip_stereo.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_compressor.asm b/tests/test_compressor.asm index ec6650d..fe2b801 100644 --- a/tests/test_compressor.asm +++ b/tests/test_compressor.asm @@ -3,8 +3,8 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 65, 65, 65, 65, - PATTERN 76, 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, + PATTERN 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 65, 65, 65, 65 + PATTERN 76, 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_compressor_stereo.asm b/tests/test_compressor_stereo.asm index 3555c01..19b7ccf 100644 --- a/tests/test_compressor_stereo.asm +++ b/tests/test_compressor_stereo.asm @@ -3,8 +3,8 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 65, 65, 65, 65, - PATTERN 76, 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, 0, 0, + PATTERN 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 65, 65, 65, 65 + PATTERN 76, 0, 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_crush.asm b/tests/test_crush.asm index 05f2658..4ceec51 100644 --- a/tests/test_crush.asm +++ b/tests/test_crush.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_crush_stereo.asm b/tests/test_crush_stereo.asm index 8206a8a..43ad5f2 100644 --- a/tests/test_crush_stereo.asm +++ b/tests/test_crush_stereo.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_delay.asm b/tests/test_delay.asm index 93b688d..55734cc 100644 --- a/tests/test_delay.asm +++ b/tests/test_delay.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm index fa5fd58..9a291ef 100644 --- a/tests/test_delay_dampmod.asm +++ b/tests/test_delay_dampmod.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_delay_drymod.asm b/tests/test_delay_drymod.asm index ad9a28b..2091739 100644 --- a/tests/test_delay_drymod.asm +++ b/tests/test_delay_drymod.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_delay_feedbackmod.asm b/tests/test_delay_feedbackmod.asm index bfdbc68..889bccd 100644 --- a/tests/test_delay_feedbackmod.asm +++ b/tests/test_delay_feedbackmod.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_delay_notetracking.asm b/tests/test_delay_notetracking.asm index 8a7a1a4..00d3676 100644 --- a/tests/test_delay_notetracking.asm +++ b/tests/test_delay_notetracking.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS ; %define SU_USE_UNDENORMALIZE ; // removing this skips denormalization code in the units diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm index 632bbea..fb46db6 100644 --- a/tests/test_delay_pregainmod.asm +++ b/tests/test_delay_pregainmod.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_delay_reverb.asm b/tests/test_delay_reverb.asm index 2c189d7..106a9ec 100644 --- a/tests/test_delay_reverb.asm +++ b/tests/test_delay_reverb.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm index 991a129..9ffe694 100644 --- a/tests/test_delay_stereo.asm +++ b/tests/test_delay_stereo.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_envelope_mod.asm b/tests/test_envelope_mod.asm index c0a8765..d9ae8af 100644 --- a/tests/test_envelope_mod.asm +++ b/tests/test_envelope_mod.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,HLD, HLD, HLD, 0, 0, 0, 0, 0, + PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD,HLD, HLD, HLD, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_filter_band.asm b/tests/test_filter_band.asm index f44fec1..1c7ad0c 100644 --- a/tests/test_filter_band.asm +++ b/tests/test_filter_band.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_filter_freqmod.asm b/tests/test_filter_freqmod.asm index 4a6a2a2..d423973 100644 --- a/tests/test_filter_freqmod.asm +++ b/tests/test_filter_freqmod.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_filter_high.asm b/tests/test_filter_high.asm index 136e210..fea76a2 100644 --- a/tests/test_filter_high.asm +++ b/tests/test_filter_high.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_filter_low.asm b/tests/test_filter_low.asm index 837d1aa..1ad2946 100644 --- a/tests/test_filter_low.asm +++ b/tests/test_filter_low.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_filter_peak.asm b/tests/test_filter_peak.asm index 4376e04..9d50b44 100644 --- a/tests/test_filter_peak.asm +++ b/tests/test_filter_peak.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_filter_resmod.asm b/tests/test_filter_resmod.asm index aadb1c6..8d95f50 100644 --- a/tests/test_filter_resmod.asm +++ b/tests/test_filter_resmod.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_filter_stereo.asm b/tests/test_filter_stereo.asm index c8b0338..0cca74f 100644 --- a/tests/test_filter_stereo.asm +++ b/tests/test_filter_stereo.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_multiple_instruments.asm b/tests/test_multiple_instruments.asm index ebe0107..b1c0d12 100644 --- a/tests/test_multiple_instruments.asm +++ b/tests/test_multiple_instruments.asm @@ -3,8 +3,8 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD, 0, 0, 0,0,0,0,0,0, - PATTERN 0, 0, 0, 0, 0, 0, 0, 0,64,HLD,HLD,0,0,0,0,0, + PATTERN 64,HLD,HLD,HLD,HLD,HLD,HLD,HLD, 0, 0, 0,0,0,0,0,0 + PATTERN 0, 0, 0, 0, 0, 0, 0, 0,64,HLD,HLD,0,0,0,0,0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_noise.asm b/tests/test_noise.asm index cf10259..b3d9303 100644 --- a/tests/test_noise.asm +++ b/tests/test_noise.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_noise_stereo.asm b/tests/test_noise_stereo.asm index 0447a5b..472af38 100644 --- a/tests/test_noise_stereo.asm +++ b/tests/test_noise_stereo.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_gate.asm b/tests/test_oscillat_gate.asm index 1b9defb..428ea9e 100644 --- a/tests/test_oscillat_gate.asm +++ b/tests/test_oscillat_gate.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_lfo.asm b/tests/test_oscillat_lfo.asm index 6e1ce73..1ce522e 100644 --- a/tests/test_oscillat_lfo.asm +++ b/tests/test_oscillat_lfo.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_pulse.asm b/tests/test_oscillat_pulse.asm index 9762ea1..3b54f91 100644 --- a/tests/test_oscillat_pulse.asm +++ b/tests/test_oscillat_pulse.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_sample.asm b/tests/test_oscillat_sample.asm index e5e05ac..cef8090 100644 --- a/tests/test_oscillat_sample.asm +++ b/tests/test_oscillat_sample.asm @@ -3,11 +3,11 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 0,0,0,0,0,0,0,0, - PATTERN 72, HLD, HLD, HLD, HLD, HLD, HLD, 0, - PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, 0, - PATTERN 60, HLD, HLD, HLD, HLD, HLD, HLD, 0, - PATTERN 40, HLD, HLD, HLD, HLD, HLD, HLD, 0, + PATTERN 0,0,0,0,0,0,0,0 + PATTERN 72, HLD, HLD, HLD, HLD, HLD, HLD, 0 + PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, 0 + PATTERN 60, HLD, HLD, HLD, HLD, HLD, HLD, 0 + PATTERN 40, HLD, HLD, HLD, HLD, HLD, HLD, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_sample_stereo.asm b/tests/test_oscillat_sample_stereo.asm index 6c66804..2ecf24b 100644 --- a/tests/test_oscillat_sample_stereo.asm +++ b/tests/test_oscillat_sample_stereo.asm @@ -3,11 +3,11 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 0,0,0,0,0,0,0,0, - PATTERN 72, HLD, HLD, HLD, HLD, HLD, HLD, 0, - PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, 0, - PATTERN 60, HLD, HLD, HLD, HLD, HLD, HLD, 0, - PATTERN 40, HLD, HLD, HLD, HLD, HLD, HLD, 0, + PATTERN 0,0,0,0,0,0,0,0 + PATTERN 72, HLD, HLD, HLD, HLD, HLD, HLD, 0 + PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, 0 + PATTERN 60, HLD, HLD, HLD, HLD, HLD, HLD, 0 + PATTERN 40, HLD, HLD, HLD, HLD, HLD, HLD, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_sine.asm b/tests/test_oscillat_sine.asm index 82e03c5..edee733 100644 --- a/tests/test_oscillat_sine.asm +++ b/tests/test_oscillat_sine.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_stereo.asm b/tests/test_oscillat_stereo.asm index 689f8c4..9a9c575 100644 --- a/tests/test_oscillat_stereo.asm +++ b/tests/test_oscillat_stereo.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_trisaw.asm b/tests/test_oscillat_trisaw.asm index c47b2d6..4575974 100644 --- a/tests/test_oscillat_trisaw.asm +++ b/tests/test_oscillat_trisaw.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_unison.asm b/tests/test_oscillat_unison.asm index 40bc445..0ec5405 100644 --- a/tests/test_oscillat_unison.asm +++ b/tests/test_oscillat_unison.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_oscillat_unison_stereo.asm b/tests/test_oscillat_unison_stereo.asm index a325aad..fc7cdf3 100644 --- a/tests/test_oscillat_unison_stereo.asm +++ b/tests/test_oscillat_unison_stereo.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0, + PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_polyphony.asm b/tests/test_polyphony.asm index bafe369..681d416 100644 --- a/tests/test_polyphony.asm +++ b/tests/test_polyphony.asm @@ -3,7 +3,7 @@ %include "sointu/header.inc" BEGIN_PATTERNS - PATTERN 64, HLD, 68, HLD, 32, HLD, HLD, HLD, 75, HLD, 78, HLD, HLD, 0, 0, 0, + PATTERN 64, HLD, 68, HLD, 32, HLD, HLD, HLD, 75, HLD, 78, HLD, HLD, 0, 0, 0 END_PATTERNS BEGIN_TRACKS diff --git a/tests/test_speed.asm b/tests/test_speed.asm index 5f88c60..e208ae8 100644 --- a/tests/test_speed.asm +++ b/tests/test_speed.asm @@ -8,9 +8,9 @@ ; samples are outputted. Here the triplets are slightly faster than the original so ; they fit the default MAX_TICKS that is calculated using the simple bpm assumption. BEGIN_PATTERNS - PATTERN 64, 0, 64, 64, 64, 0, 64, 64, 64, 0, 64, 64, 65, 0, 65, 65, - PATTERN 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ; 4-rows - PATTERN 78, 0, 54, 0, 78, 0, 54, 0, 78, 0, 54, 0, 78, 0, 54, 0, ; triplets + PATTERN 64, 0, 64, 64, 64, 0, 64, 64, 64, 0, 64, 64, 65, 0, 65, 65 + PATTERN 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; 4-rows + PATTERN 78, 0, 54, 0, 78, 0, 54, 0, 78, 0, 54, 0, 78, 0, 54, 0 ; triplets END_PATTERNS BEGIN_TRACKS