diff --git a/CMakeLists.txt b/CMakeLists.txt index 70d348e..779ad19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ set(CMAKE_ASM_NASM_COMPILE_OBJECT " :warning: **If you are using MinGW**: Yasm 1.3.0 (currently still the latest +> :warning: **If you are using MinGW and Yasm**: Yasm 1.3.0 (currently still the latest stable release) and GNU linker do not play nicely along, trashing the BSS layout. See [here](https://tortall.lighthouseapp.com/projects/78676/tickets/274-bss-problem-with-windows-win64) and the fix [here](https://github.com/yasm/yasm/commit/1910e914792399137dec0b047c59965207245df5). @@ -70,10 +71,11 @@ New features since fork opcodes actually used in a song are compiled into the virtual machine. The goal is to try to write the code so that if two similar opcodes are used, the common code in both is reused by moving it to a function. - - **Take the macro languge to its logical conclusion**. Only the patch - definition should be needed; all the %define USE_SOMETHING will be - defined automatically by the macros. Furthermore, only the opcodes needed - are compiled into the program. Done, see for example + - **Take the macro languge to its logical conclusion**: it should probably be + called an internal domain specific language, hosted within the .asm preprocessor, + implemented using loads of macro definitions. Only the patch definition is needed; + all the %define USE_SOMETHING will be defined automatically by the macros. Only + the opcodes needed are compiled into the program. Done, see for example [this test](tests/test_oscillat_trisaw.asm)! This has the nice implication that, in future, there will be no need for binary format to save patches: the .asm is easy enough to be imported into / exported from the GUI. Being a text @@ -126,7 +128,7 @@ New features since fork 64-bit Linux, tested on WSL. 32-bit executables don't run on WSL, so those remain to be tested. - **Compiling as a library**. The API is very rudimentary, a single function - render_samples, and between calls, the user is responsible for manipulating + render, and between calls, the user is responsible for manipulating the synth state in a similar way as the actual player does (e.g. triggering/ releasing voices etc.) - **Calling Sointu as a library from Go language**. The Go API is slighty more diff --git a/include/sointu/opcodes/arithmetic_footer.inc b/include/sointu/arithmetic_footer.inc similarity index 100% rename from include/sointu/opcodes/arithmetic_footer.inc rename to include/sointu/arithmetic_footer.inc diff --git a/include/sointu/opcodes/arithmetic_header.inc b/include/sointu/arithmetic_header.inc similarity index 100% rename from include/sointu/opcodes/arithmetic_header.inc rename to include/sointu/arithmetic_header.inc diff --git a/include/sointu/opcodes/effects_footer.inc b/include/sointu/effects_footer.inc similarity index 98% rename from include/sointu/opcodes/effects_footer.inc rename to include/sointu/effects_footer.inc index 6337ed6..0ae089b 100644 --- a/include/sointu/opcodes/effects_footer.inc +++ b/include/sointu/effects_footer.inc @@ -317,7 +317,12 @@ EXPORT MANGLE_FUNC(su_op_delay,0) lodsw ; al = delay index, ah = delay count push_registers VAL, COM ; these are non-volatile according to our convention movzx ebx, al +%ifdef RUNTIME_TABLES ; when using runtime tables, delaytimes is pulled from the stack so can be a pointer to heap + mov _SI, [_SP + su_stack.delaytimes + PUSH_REG_SIZE(2)] + lea _BX, [_SI + _BX*2] +%else do{lea _BX,[},MANGLE_DATA(su_delay_times),_BX*2,] ; _BP now points to the right position within delay time table +%endif movzx esi, word [_SP + su_stack.tick + PUSH_REG_SIZE(2)] ; notice that we load word, so we wrap at 65536 mov _CX, PTRWORD [_SP + su_stack.delaywrk + PUSH_REG_SIZE(2)] ; WRK is now the separate delay workspace, as they require a lot more space %ifdef INCLUDE_STEREO_DELAY diff --git a/include/sointu/opcodes/effects_header.inc b/include/sointu/effects_header.inc similarity index 98% rename from include/sointu/opcodes/effects_header.inc rename to include/sointu/effects_header.inc index df799da..1c6f3d9 100644 --- a/include/sointu/opcodes/effects_header.inc +++ b/include/sointu/effects_header.inc @@ -276,20 +276,20 @@ endstruc %define MAX_DELAY 65536 ; warning: this is pretty much fixed, as we use 16-bit math to wraparound the delay buffers %assign NUM_DELAY_LINES 0 -%macro SU_DELAY 7 +%macro SU_DELAY 8 db %2 db %3 db %4 db %5 db %6 - db %7 + db (2*%7-1)+%8 USE_DELAY %xdefine CMDS CMDS DELAY_ID + %1, %assign NUM_DELAY_LINES NUM_DELAY_LINES + %7 * (1+%1) %if %1 == STEREO %define INCLUDE_STEREO_DELAY %endif - %if (%7) & NOTETRACKING == 0 + %if (%8) & NOTETRACKING == 1 %define INCLUDE_DELAY_NOTETRACKING %define INCLUDE_DELAY_FLOAT_TIME %endif @@ -317,7 +317,7 @@ endstruc %define DEPTH(val) val %define DAMP(val) val %define DELAY(val) val -%define COUNT(val) (2*val-1) +%define COUNT(val) val %define NOTETRACKING 1 struc su_delay_ports @@ -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/opcodes/flowcontrol_footer.inc b/include/sointu/flowcontrol_footer.inc similarity index 100% rename from include/sointu/opcodes/flowcontrol_footer.inc rename to include/sointu/flowcontrol_footer.inc diff --git a/include/sointu/opcodes/flowcontrol_header.inc b/include/sointu/flowcontrol_header.inc similarity index 100% rename from include/sointu/opcodes/flowcontrol_header.inc rename to include/sointu/flowcontrol_header.inc diff --git a/include/sointu/sointu_footer.inc b/include/sointu/footer.inc similarity index 94% rename from include/sointu/sointu_footer.inc rename to include/sointu/footer.inc index 4daba8a..39d8a64 100644 --- a/include/sointu/sointu_footer.inc +++ b/include/sointu/footer.inc @@ -141,16 +141,24 @@ 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 RUNTIME_TABLES ; RUNTIME_TABLES move these table ptrs to stack + %if DELAY_ID > -1 ; allowing them to be in the heap & + .delaytimes RESPTR 1 ; modifying them safely & having many synths + %endif + %ifdef INCLUDE_SAMPLES + .sampleoffs RESPTR 1 + %endif +%endif %ifdef INCLUDE_MULTIVOICE_TRACKS .voicetrack RESPTR 1 %endif - .render_epilogue + .render_epilogue: %if BITS == 32 RESPTR 8 ; registers .retaddr_pl RESPTR 1 @@ -160,7 +168,7 @@ struc su_stack ; the structure of stack _as the units see it_ RESPTR 2 ; registers %endif .bufferptr RESPTR 1 - .size + .size: endstruc ;=============================================================================== @@ -344,6 +352,14 @@ EXPORT MANGLE_FUNC(su_render_song,PTRSIZE) ; Stack: ptr xor eax, eax %ifdef INCLUDE_MULTIVOICE_TRACKS push VOICETRACK_BITMASK +%endif +%ifdef RUNTIME_TABLES ; runtime tables is actually only useful in the api use case, but it's nice it works also in the render case + %ifdef INCLUDE_SAMPLES + do push ,MANGLE_DATA(su_sample_offsets) ; &su_sample_offsets is in the stack, instead of hard coded + %endif + %if DELAY_ID > -1 + do push ,MANGLE_DATA(su_delay_times) ; &su_delay_times is in the stack, instead of hard coded + %endif %endif push 1 ; randseed push _AX ; global tick time @@ -379,11 +395,13 @@ su_render_sampleloop: ; loop through every sample in the row inc eax cmp eax, TOTAL_ROWS jl su_render_rowloop -%ifdef INCLUDE_MULTIVOICE_TRACKS + ; rewind the stack. Use add when there's a lot to clean, repeated pops if only a little +%if su_stack.render_epilogue - su_stack.tick > 3*PTRSIZE add _SP, su_stack.render_epilogue - su_stack.tick ; rewind the remaining tack %else - pop _AX - pop _AX + %rep (su_stack.render_epilogue - su_stack.tick)/PTRSIZE + pop _AX ; the entropy of 3 x pop _AX is probably lower than 3 byte add + %endrep ; but this needs to be confirmed %endif render_epilogue @@ -488,22 +506,22 @@ su_update_voices_skipadd: ;------------------------------------------------------------------------------- ; Include the rest of the code ;------------------------------------------------------------------------------- -%include "opcodes/arithmetic_footer.inc" -%include "opcodes/flowcontrol_footer.inc" -%include "opcodes/sources_footer.inc" -%include "opcodes/sinks_footer.inc" +%include "sointu/arithmetic_footer.inc" +%include "sointu/flowcontrol_footer.inc" +%include "sointu/sources_footer.inc" +%include "sointu/sinks_footer.inc" ; warning: at the moment effects has to be assembled after ; sources, as sources.asm defines SU_USE_WAVESHAPER ; if needed. -%include "opcodes/effects_footer.inc" -%include "introspection_footer.inc" +%include "sointu/effects_footer.inc" +%include "sointu/introspection_footer.inc" %ifidn __OUTPUT_FORMAT__,win64 - %include "win64/gmdls_win64_footer.inc" + %include "sointu/win64/gmdls_win64_footer.inc" %endif %ifidn __OUTPUT_FORMAT__,win32 - %include "win32/gmdls_win32_footer.inc" + %include "sointu/win32/gmdls_win32_footer.inc" %endif ;------------------------------------------------------------------------------- diff --git a/include/sointu/sointu_header.inc b/include/sointu/header.inc similarity index 97% rename from include/sointu/sointu_header.inc rename to include/sointu/header.inc index 44351d7..e0963bb 100644 --- a/include/sointu/sointu_header.inc +++ b/include/sointu/header.inc @@ -6,7 +6,7 @@ %macro EXPORT 1 global %1 - %1 + %1: %endmacro %ifidn __OUTPUT_FORMAT__,win32 @@ -88,11 +88,11 @@ section .text ; yasm throws section redeclaration warnings if strucs are defined without a plain .text section -%include "opcodes/flowcontrol_header.inc" -%include "opcodes/arithmetic_header.inc" -%include "opcodes/effects_header.inc" -%include "opcodes/sources_header.inc" -%include "opcodes/sinks_header.inc" +%include "sointu/flowcontrol_header.inc" +%include "sointu/arithmetic_header.inc" +%include "sointu/effects_header.inc" +%include "sointu/sources_header.inc" +%include "sointu/sinks_header.inc" ;------------------------------------------------------------------------------- ; synth defines @@ -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/opcodes/sinks_footer.inc b/include/sointu/sinks_footer.inc similarity index 100% rename from include/sointu/opcodes/sinks_footer.inc rename to include/sointu/sinks_footer.inc diff --git a/include/sointu/opcodes/sinks_header.inc b/include/sointu/sinks_header.inc similarity index 82% rename from include/sointu/opcodes/sinks_header.inc rename to include/sointu/sinks_header.inc index c0c0b01..2303962 100644 --- a/include/sointu/opcodes/sinks_header.inc +++ b/include/sointu/sinks_header.inc @@ -99,23 +99,33 @@ endstruc %endif %endmacro -%macro SU_SEND 3 +%macro SU_SEND 5 ; local send (params: STEREO, AMOUNT, UNIT, PORT, FLAGS) db %2 - dw %3 + dw ((%3+1)*su_unit.size + su_unit.ports)/4 + %4 + %5 USE_SEND %xdefine CMDS CMDS SEND_ID + %1, %if %1 == STEREO %define INCLUDE_STEREO_SEND %endif - %if (%3) & SEND_GLOBAL == SEND_GLOBAL - %define INCLUDE_GLOBAL_SEND - %endif %endmacro +%macro SU_SEND 6 ; global send (params: STEREO, AMOUNT, VOICE, UNIT, PORT, FLAGS) + db %2 + dw SEND_GLOBAL + (su_synthworkspace.voices+%3*su_voice.size+su_voice.workspace+%4*su_unit.size + su_unit.ports)/4 + %5 + %6 + USE_SEND + %xdefine CMDS CMDS SEND_ID + %1, + %if %1 == STEREO + %define INCLUDE_STEREO_SEND + %endif + %define INCLUDE_GLOBAL_SEND +%endmacro + +%define VOICE(val) val +%define UNIT(val) val +%define PORT(val) val %define AMOUNT(val) val -%define LOCALPORT(unit,port) ((unit+1)*su_unit.size + su_unit.ports)/4 + port -%define GLOBALPORT(voice,unit,port) SEND_GLOBAL + (su_synthworkspace.voices+voice*su_voice.size+su_voice.workspace+unit*su_unit.size + su_unit.ports)/4 + port %define OUTPORT 0 +%define NONE 0 %define SEND_POP 0x8000 %define SEND_GLOBAL 0x4000 diff --git a/include/sointu/opcodes/sources_footer.inc b/include/sointu/sources_footer.inc similarity index 96% rename from include/sointu/opcodes/sources_footer.inc rename to include/sointu/sources_footer.inc index 8430aac..2b0f89c 100644 --- a/include/sointu/opcodes/sources_footer.inc +++ b/include/sointu/sources_footer.inc @@ -106,6 +106,11 @@ SECT_TEXT(suoscill) EXPORT MANGLE_FUNC(su_op_oscillat,0) lodsb ; load the flags +%ifdef RUNTIME_TABLES + %ifdef INCLUDE_SAMPLES + mov _DI, [_SP + su_stack.sampleoffs]; we need to put this in a register, as the stereo & unisons screw the stack positions + %endif ; ain't we lucky that _DI was unused throughout +%endif fld dword [INP+su_osc_ports.detune] ; e, where e is the detune [0,1] do fsub dword [,c_0_5,] ; e-.5 fadd st0, st0 ; d=2*e-.5, where d is the detune [-1,1] @@ -260,7 +265,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 @@ -311,7 +316,11 @@ su_oscillat_sample: ; p push_registers _AX,_DX,_CX,_BX ; edx must be saved, eax & ecx if this is stereo osc push _AX mov al, byte [VAL-4] ; reuse "color" as the sample number +%ifdef RUNTIME_TABLES ; when using RUNTIME_TABLES, assumed the sample_offset ptr is in _DI + do{lea _DI, [}, _DI, _AX*8,] ; edi points now to the sample table entry +%else do{lea _DI, [}, MANGLE_DATA(su_sample_offsets), _AX*8,]; edi points now to the sample table entry +%endif do fmul dword [,c_samplefreq_scaling,] ; p*r fistp dword [_SP] pop _DX ; edx is now the sample number diff --git a/include/sointu/opcodes/sources_header.inc b/include/sointu/sources_header.inc similarity index 100% rename from include/sointu/opcodes/sources_header.inc rename to include/sointu/sources_header.inc 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/render.asm b/render.asm index 8a5f76e..c07ecb9 100644 --- a/render.asm +++ b/render.asm @@ -1,7 +1,7 @@ ; source file for compiling sointu as a library %define SU_DISABLE_PLAYER -%include "sointu_header.inc" +%include "sointu/header.inc" ; TODO: make sure compile everything in @@ -21,7 +21,7 @@ USE_OUT %define INCLUDE_POLYPHONY %define INCLUDE_MULTIVOICE_TRACKS -%include "sointu_footer.inc" +%include "sointu/footer.inc" section .text diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 63b8e4a..0026469 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -97,6 +97,10 @@ if(WIN32) # The samples are currently only GMDLs based, and thus require Windows target_compile_definitions(test_oscillat_sample PUBLIC INCLUDE_GMDLS) regression_test(test_oscillat_sample_stereo ENVELOPE) target_compile_definitions(test_oscillat_sample_stereo PUBLIC INCLUDE_GMDLS) + regression_test(test_oscillat_sample_rtables ENVELOPE "" test_oscillat_sample.asm) + target_compile_definitions(test_oscillat_sample_rtables PUBLIC INCLUDE_GMDLS RUNTIME_TABLES) + regression_test(test_oscillat_sample_stereo_rtables ENVELOPE "" test_oscillat_sample_stereo.asm) + target_compile_definitions(test_oscillat_sample_stereo_rtables PUBLIC INCLUDE_GMDLS RUNTIME_TABLES) endif() regression_test(test_oscillat_unison ENVELOPE) regression_test(test_oscillat_unison_stereo ENVELOPE) @@ -143,6 +147,11 @@ regression_test(test_delay_dampmod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND") regression_test(test_delay_drymod "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND") regression_test(test_delay_flanger "ENVELOPE;FOP_MULP;PANNING;VCO_SINE;SEND") +regression_test(test_delay_rtables "ENVELOPE;FOP_MULP;PANNING;VCO_SINE" "" test_delay.asm) +target_compile_definitions(test_delay_rtables PUBLIC RUNTIME_TABLES) +regression_test(test_delay_stereo_rtables "ENVELOPE;FOP_MULP;PANNING;VCO_SINE" "" test_delay_stereo.asm) +target_compile_definitions(test_delay_stereo_rtables PUBLIC RUNTIME_TABLES) + regression_test(test_envelope_mod "VCO_SINE;ENVELOPE;SEND") regression_test(test_envelope_16bit ENVELOPE "" test_envelope.asm) target_compile_definitions(test_envelope_16bit PUBLIC SU_USE_16BIT_OUTPUT) diff --git a/tests/expected_output/test_delay_rtables.raw b/tests/expected_output/test_delay_rtables.raw new file mode 100644 index 0000000..7c5d7fd Binary files /dev/null and b/tests/expected_output/test_delay_rtables.raw differ diff --git a/tests/expected_output/test_delay_stereo_rtables.raw b/tests/expected_output/test_delay_stereo_rtables.raw new file mode 100644 index 0000000..1fe0d18 Binary files /dev/null and b/tests/expected_output/test_delay_stereo_rtables.raw differ diff --git a/tests/expected_output/test_oscillat_sample_rtables.raw b/tests/expected_output/test_oscillat_sample_rtables.raw new file mode 100644 index 0000000..403b433 Binary files /dev/null and b/tests/expected_output/test_oscillat_sample_rtables.raw differ diff --git a/tests/expected_output/test_oscillat_sample_stereo_rtables.raw b/tests/expected_output/test_oscillat_sample_stereo_rtables.raw new file mode 100644 index 0000000..6dad331 Binary files /dev/null and b/tests/expected_output/test_oscillat_sample_stereo_rtables.raw differ diff --git a/tests/test_add.asm b/tests/test_add.asm index 4731a1f..9d3b43e 100644 --- a/tests/test_add.asm +++ b/tests/test_add.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -19,4 +19,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_add_stereo.asm b/tests/test_add_stereo.asm index 48f04db..47caf8b 100644 --- a/tests/test_add_stereo.asm +++ b/tests/test_add_stereo.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -24,4 +24,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_addp.asm b/tests/test_addp.asm index 6a85f8c..1668225 100644 --- a/tests/test_addp.asm +++ b/tests/test_addp.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -22,4 +22,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_addp_stereo.asm b/tests/test_addp_stereo.asm index 6824d42..6fe1f9d 100644 --- a/tests/test_addp_stereo.asm +++ b/tests/test_addp_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_aux.asm b/tests/test_aux.asm index f65245c..10b13bd 100644 --- a/tests/test_aux.asm +++ b/tests/test_aux.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -19,4 +19,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_aux_stereo.asm b/tests/test_aux_stereo.asm index f54144b..1f4e5e3 100644 --- a/tests/test_aux_stereo.asm +++ b/tests/test_aux_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -25,4 +25,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_chords.asm b/tests/test_chords.asm index b68d8d6..a101138 100644 --- a/tests/test_chords.asm +++ b/tests/test_chords.asm @@ -1,11 +1,11 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -25,4 +25,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_clip.asm b/tests/test_clip.asm index 3f33c38..3c78f3f 100644 --- a/tests/test_clip.asm +++ b/tests/test_clip.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -24,4 +24,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_clip_stereo.asm b/tests/test_clip_stereo.asm index 9a83a06..5eef286 100644 --- a/tests/test_clip_stereo.asm +++ b/tests/test_clip_stereo.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -24,4 +24,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_compressor.asm b/tests/test_compressor.asm index 775363b..5114ae3 100644 --- a/tests/test_compressor.asm +++ b/tests/test_compressor.asm @@ -1,10 +1,10 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -19,8 +19,8 @@ BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_MULP STEREO - SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,0) + SEND_POP - SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,1) + SEND_POP + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),FLAGS(SEND_POP) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) @@ -28,8 +28,8 @@ BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP STEREO - SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,0) + SEND_POP - SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,1) + SEND_POP + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),FLAGS(SEND_POP) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect SU_RECEIVE STEREO @@ -39,4 +39,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_compressor_stereo.asm b/tests/test_compressor_stereo.asm index a48b99e..e53080b 100644 --- a/tests/test_compressor_stereo.asm +++ b/tests/test_compressor_stereo.asm @@ -1,10 +1,10 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -19,8 +19,8 @@ BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_MULP STEREO - SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,0) + SEND_POP - SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,1) + SEND_POP + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),FLAGS(SEND_POP) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128) @@ -28,8 +28,8 @@ BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_OSCILLAT MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP STEREO - SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,0) + SEND_POP - SU_SEND MONO,AMOUNT(128),GLOBALPORT(2,0,1) + SEND_POP + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(0),FLAGS(SEND_POP) + SU_SEND MONO,AMOUNT(128),VOICE(2),UNIT(0),PORT(1),FLAGS(SEND_POP) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Global compressor effect SU_RECEIVE STEREO @@ -39,4 +39,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_crush.asm b/tests/test_crush.asm index ac3405c..4ceec51 100644 --- a/tests/test_crush.asm +++ b/tests/test_crush.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -24,4 +24,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_crush_stereo.asm b/tests/test_crush_stereo.asm index 4326d97..43ad5f2 100644 --- a/tests/test_crush_stereo.asm +++ b/tests/test_crush_stereo.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -23,4 +23,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_delay.asm b/tests/test_delay.asm index 06bab0e..179ebc5 100644 --- a/tests/test_delay.asm +++ b/tests/test_delay.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -15,7 +15,7 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO, GAIN(128) END_INSTRUMENT @@ -25,4 +25,4 @@ BEGIN_DELTIMES DELTIME 11025 END_DELTIMES -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm index e8b0c3d..4c9c2f5 100644 --- a/tests/test_delay_dampmod.asm +++ b/tests/test_delay_dampmod.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -15,11 +15,11 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(32),LOCALPORT(3,3) + SEND_POP + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(3),FLAGS(SEND_POP) END_INSTRUMENT END_PATCH @@ -27,4 +27,4 @@ BEGIN_DELTIMES DELTIME 11025 END_DELTIMES -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_delay_drymod.asm b/tests/test_delay_drymod.asm index 91bd5c8..22e7451 100644 --- a/tests/test_delay_drymod.asm +++ b/tests/test_delay_drymod.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -15,11 +15,11 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(32),LOCALPORT(3,1) + SEND_POP + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(1),FLAGS(SEND_POP) END_INSTRUMENT END_PATCH @@ -27,4 +27,4 @@ BEGIN_DELTIMES DELTIME 11025 END_DELTIMES -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_delay_feedbackmod.asm b/tests/test_delay_feedbackmod.asm index 5ac75ad..bf96142 100644 --- a/tests/test_delay_feedbackmod.asm +++ b/tests/test_delay_feedbackmod.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -15,11 +15,11 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(32),LOCALPORT(3,2) + SEND_POP + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(2),FLAGS(SEND_POP) END_INSTRUMENT END_PATCH @@ -27,4 +27,4 @@ BEGIN_DELTIMES DELTIME 11025 END_DELTIMES -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_delay_flanger.asm b/tests/test_delay_flanger.asm index 3dddbad..f8254b2 100644 --- a/tests/test_delay_flanger.asm +++ b/tests/test_delay_flanger.asm @@ -1,7 +1,7 @@ %define BPM 100 %define INCLUDE_DELAY_MODULATION -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 @@ -16,11 +16,11 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(TRISAW) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(50),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(65),LOCALPORT(3,5) + SEND_POP + SU_SEND MONO,AMOUNT(65),UNIT(3),PORT(5),FLAGS(SEND_POP) END_INSTRUMENT END_PATCH @@ -28,4 +28,4 @@ BEGIN_DELTIMES DELTIME 1000 END_DELTIMES -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_delay_notetracking.asm b/tests/test_delay_notetracking.asm index 226d2e6..e936c34 100644 --- a/tests/test_delay_notetracking.asm +++ b/tests/test_delay_notetracking.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -19,7 +19,7 @@ BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(64),SHAPE(127),GAIN(64),FLAGS(SINE) SU_MULP MONO SU_FILTER MONO,FREQUENCY(32),RESONANCE(128),FLAGS(LOWPASS + BANDPASS + HIGHPASS) - SU_DELAY MONO,PREGAIN(128),DRY(128),FEEDBACK(128),DAMP(16),DELAY(0),COUNT(1) + NOTETRACKING + SU_DELAY MONO,PREGAIN(128),DRY(128),FEEDBACK(128),DAMP(16),DELAY(0),COUNT(1),FLAGS(NOTETRACKING) SU_FILTER MONO,FREQUENCY(24),RESONANCE(128),FLAGS(LOWPASS + BANDPASS + HIGHPASS) SU_MULP MONO SU_PAN MONO,PANNING(64) @@ -31,4 +31,4 @@ BEGIN_DELTIMES DELTIME 10787 END_DELTIMES -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm index 4d77dea..1c22dd3 100644 --- a/tests/test_delay_pregainmod.asm +++ b/tests/test_delay_pregainmod.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -15,11 +15,11 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(32),LOCALPORT(3,0) + SEND_POP + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(0),FLAGS(SEND_POP) END_INSTRUMENT END_PATCH @@ -27,4 +27,4 @@ BEGIN_DELTIMES DELTIME 11025 END_DELTIMES -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_delay_reverb.asm b/tests/test_delay_reverb.asm index 542662c..be9337b 100644 --- a/tests/test_delay_reverb.asm +++ b/tests/test_delay_reverb.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -15,7 +15,7 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO - SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8) + SU_DELAY MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8),FLAGS(NONE) SU_PAN MONO,PANNING(64) SU_OUT STEREO, GAIN(128) END_INSTRUMENT @@ -25,4 +25,4 @@ BEGIN_DELTIMES DELTIME 1116,1188,1276,1356,1422,1492,1556,1618 END_DELTIMES -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm index 250bcc5..aa7790b 100644 --- a/tests/test_delay_stereo.asm +++ b/tests/test_delay_stereo.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -16,7 +16,7 @@ BEGIN_PATCH SU_OSCILLAT MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE) SU_MULP MONO SU_PAN MONO,PANNING(64) - SU_DELAY STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1) + SU_DELAY STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),FLAGS(NONE) SU_OUT STEREO, GAIN(128) END_INSTRUMENT END_PATCH @@ -26,4 +26,4 @@ BEGIN_DELTIMES DELTIME 21025 END_DELTIMES -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_distort.asm b/tests/test_distort.asm index 3a15013..11e2c1a 100644 --- a/tests/test_distort.asm +++ b/tests/test_distort.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -20,4 +20,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_distort_mod.asm b/tests/test_distort_mod.asm index 20a90dc..660c4ed 100644 --- a/tests/test_distort_mod.asm +++ b/tests/test_distort_mod.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -17,10 +17,10 @@ BEGIN_PATCH SU_ENVELOPE MONO, ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_DISTORT MONO, DRIVE(96) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(68),LOCALPORT(1,0) - SU_SEND MONO,AMOUNT(68),LOCALPORT(3,0) + SEND_POP + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(0),FLAGS(NONE) + SU_SEND MONO,AMOUNT(68),UNIT(3),PORT(0),FLAGS(SEND_POP) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_distort_stereo.asm b/tests/test_distort_stereo.asm index 5bda97f..44fa9fb 100644 --- a/tests/test_distort_stereo.asm +++ b/tests/test_distort_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -18,4 +18,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_envelope.asm b/tests/test_envelope.asm index ebaced4..f24621d 100644 --- a/tests/test_envelope.asm +++ b/tests/test_envelope.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -18,4 +18,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_envelope_mod.asm b/tests/test_envelope_mod.asm index 810ab65..859f784 100644 --- a/tests/test_envelope_mod.asm +++ b/tests/test_envelope_mod.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -15,13 +15,13 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_ENVELOPE MONO,ATTAC(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(120),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(68),LOCALPORT(0,0) - SU_SEND MONO,AMOUNT(68),LOCALPORT(0,1) + SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(0),FLAGS(NONE) + SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(1),FLAGS(NONE) ; Sustain modulation seems not to be implemented - SU_SEND MONO,AMOUNT(68),LOCALPORT(0,3) - SU_SEND MONO,AMOUNT(68),LOCALPORT(1,4) + SEND_POP + SU_SEND MONO,AMOUNT(68),UNIT(0),PORT(3),FLAGS(NONE) + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(4),FLAGS(SEND_POP) SU_OUT STEREO,GAIN(110) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_envelope_stereo.asm b/tests/test_envelope_stereo.asm index 405b671..e29f055 100644 --- a/tests/test_envelope_stereo.asm +++ b/tests/test_envelope_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -17,4 +17,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_filter_band.asm b/tests/test_filter_band.asm index fdf4636..1c7ad0c 100644 --- a/tests/test_filter_band.asm +++ b/tests/test_filter_band.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_filter_freqmod.asm b/tests/test_filter_freqmod.asm index 66881e2..986fb42 100644 --- a/tests/test_filter_freqmod.asm +++ b/tests/test_filter_freqmod.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -19,8 +19,8 @@ BEGIN_PATCH SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(32),LOCALPORT(3,0) + SEND_POP + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(0),FLAGS(SEND_POP) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_filter_high.asm b/tests/test_filter_high.asm index fbd016a..fea76a2 100644 --- a/tests/test_filter_high.asm +++ b/tests/test_filter_high.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_filter_low.asm b/tests/test_filter_low.asm index 96c5070..1ad2946 100644 --- a/tests/test_filter_low.asm +++ b/tests/test_filter_low.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_filter_peak.asm b/tests/test_filter_peak.asm index 1dfcc83..9d50b44 100644 --- a/tests/test_filter_peak.asm +++ b/tests/test_filter_peak.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_filter_resmod.asm b/tests/test_filter_resmod.asm index cd086b7..28388cc 100644 --- a/tests/test_filter_resmod.asm +++ b/tests/test_filter_resmod.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -19,8 +19,8 @@ BEGIN_PATCH SU_PAN MONO,PANNING(64) SU_OUT STEREO,GAIN(128) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(32),LOCALPORT(3,1) + SEND_POP + SU_SEND MONO,AMOUNT(32),UNIT(3),PORT(1),FLAGS(SEND_POP) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_filter_stereo.asm b/tests/test_filter_stereo.asm index 1757615..0cca74f 100644 --- a/tests/test_filter_stereo.asm +++ b/tests/test_filter_stereo.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_gain.asm b/tests/test_gain.asm index d3102ad..4915473 100644 --- a/tests/test_gain.asm +++ b/tests/test_gain.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -19,4 +19,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_gain_stereo.asm b/tests/test_gain_stereo.asm index 1adb09a..1879aba 100644 --- a/tests/test_gain_stereo.asm +++ b/tests/test_gain_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -20,4 +20,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_hold.asm b/tests/test_hold.asm index ba3c707..a84634c 100644 --- a/tests/test_hold.asm +++ b/tests/test_hold.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -20,4 +20,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_hold_mod.asm b/tests/test_hold_mod.asm index 31603c4..41c011e 100644 --- a/tests/test_hold_mod.asm +++ b/tests/test_hold_mod.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -17,10 +17,10 @@ BEGIN_PATCH SU_ENVELOPE MONO,ATTAC(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128) SU_HOLD MONO,HOLDFREQ(3) SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(68),LOCALPORT(1,0) - SU_SEND MONO,AMOUNT(68),LOCALPORT(3,0) + SEND_POP + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(0),FLAGS(NONE) + SU_SEND MONO,AMOUNT(68),UNIT(3),PORT(0),FLAGS(SEND_POP) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_hold_stereo.asm b/tests/test_hold_stereo.asm index 2703e06..4e72ea6 100644 --- a/tests/test_hold_stereo.asm +++ b/tests/test_hold_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -19,4 +19,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_in.asm b/tests/test_in.asm index 75233aa..982aaa9 100644 --- a/tests/test_in.asm +++ b/tests/test_in.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -24,4 +24,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_in_stereo.asm b/tests/test_in_stereo.asm index 0b4aa78..56d5c58 100644 --- a/tests/test_in_stereo.asm +++ b/tests/test_in_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -23,4 +23,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_invgain.asm b/tests/test_invgain.asm index bbbd931..1c273ee 100644 --- a/tests/test_invgain.asm +++ b/tests/test_invgain.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -20,4 +20,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_invgain_stereo.asm b/tests/test_invgain_stereo.asm index 14c4888..e8750bf 100644 --- a/tests/test_invgain_stereo.asm +++ b/tests/test_invgain_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -19,4 +19,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_loadnote.asm b/tests/test_loadnote.asm index f6184b4..f32dc7f 100644 --- a/tests/test_loadnote.asm +++ b/tests/test_loadnote.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 @@ -18,4 +18,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_loadnote_stereo.asm b/tests/test_loadnote_stereo.asm index 8200db5..7cd808a 100644 --- a/tests/test_loadnote_stereo.asm +++ b/tests/test_loadnote_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0 @@ -17,4 +17,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_loadval.asm b/tests/test_loadval.asm index c572146..73d682e 100644 --- a/tests/test_loadval.asm +++ b/tests/test_loadval.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -18,4 +18,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_loadval_stereo.asm b/tests/test_loadval_stereo.asm index 3004f05..6d7ed80 100644 --- a/tests/test_loadval_stereo.asm +++ b/tests/test_loadval_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -17,4 +17,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_mul.asm b/tests/test_mul.asm index 5b1dc91..afe7e66 100644 --- a/tests/test_mul.asm +++ b/tests/test_mul.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -19,4 +19,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_mul_stereo.asm b/tests/test_mul_stereo.asm index 948df3c..14b0563 100644 --- a/tests/test_mul_stereo.asm +++ b/tests/test_mul_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -24,4 +24,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_mulp.asm b/tests/test_mulp.asm index 9904c3c..aa55180 100644 --- a/tests/test_mulp.asm +++ b/tests/test_mulp.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -22,4 +22,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_mulp_stereo.asm b/tests/test_mulp_stereo.asm index 96c9bef..b11b4bd 100644 --- a/tests/test_mulp_stereo.asm +++ b/tests/test_mulp_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_multiple_instruments.asm b/tests/test_multiple_instruments.asm index cd33b4e..b1c0d12 100644 --- a/tests/test_multiple_instruments.asm +++ b/tests/test_multiple_instruments.asm @@ -1,10 +1,10 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -25,4 +25,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_noise.asm b/tests/test_noise.asm index 0dfa6d9..b3d9303 100644 --- a/tests/test_noise.asm +++ b/tests/test_noise.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -22,4 +22,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_noise_stereo.asm b/tests/test_noise_stereo.asm index 672ae17..472af38 100644 --- a/tests/test_noise_stereo.asm +++ b/tests/test_noise_stereo.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -20,4 +20,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_colormod.asm b/tests/test_oscillat_colormod.asm index bf5689d..cca5c26 100644 --- a/tests/test_oscillat_colormod.asm +++ b/tests/test_oscillat_colormod.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 @@ -17,9 +17,9 @@ BEGIN_PATCH SU_MULP MONO SU_PUSH MONO SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(68),LOCALPORT(1,3) + SEND_POP + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(3),FLAGS(SEND_POP) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_detunemod.asm b/tests/test_oscillat_detunemod.asm index 54bf97b..d6dc8d4 100644 --- a/tests/test_oscillat_detunemod.asm +++ b/tests/test_oscillat_detunemod.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 @@ -17,9 +17,9 @@ BEGIN_PATCH SU_MULP MONO SU_PUSH MONO SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE+LFO) - SU_SEND MONO,AMOUNT(96),LOCALPORT(1,1) + SEND_POP + SU_SEND MONO,AMOUNT(96),UNIT(1),PORT(1),FLAGS(SEND_POP) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_gainmod.asm b/tests/test_oscillat_gainmod.asm index 520a00d..72c3462 100644 --- a/tests/test_oscillat_gainmod.asm +++ b/tests/test_oscillat_gainmod.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 @@ -17,9 +17,9 @@ BEGIN_PATCH SU_MULP MONO SU_PUSH MONO SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(68),LOCALPORT(1,5) + SEND_POP + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(5),FLAGS(SEND_POP) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_gate.asm b/tests/test_oscillat_gate.asm index 3b8f46b..428ea9e 100644 --- a/tests/test_oscillat_gate.asm +++ b/tests/test_oscillat_gate.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_lfo.asm b/tests/test_oscillat_lfo.asm index 715e770..1ce522e 100644 --- a/tests/test_oscillat_lfo.asm +++ b/tests/test_oscillat_lfo.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_phasemod.asm b/tests/test_oscillat_phasemod.asm index 223c2a0..230ae52 100644 --- a/tests/test_oscillat_phasemod.asm +++ b/tests/test_oscillat_phasemod.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 @@ -17,9 +17,9 @@ BEGIN_PATCH SU_MULP MONO SU_PUSH MONO SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(128),LOCALPORT(1,2) + SEND_POP + SU_SEND MONO,AMOUNT(128),UNIT(1),PORT(2),FLAGS(SEND_POP) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_pulse.asm b/tests/test_oscillat_pulse.asm index 70914b1..3b54f91 100644 --- a/tests/test_oscillat_pulse.asm +++ b/tests/test_oscillat_pulse.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_sample.asm b/tests/test_oscillat_sample.asm index 436a75f..1c339b3 100644 --- a/tests/test_oscillat_sample.asm +++ b/tests/test_oscillat_sample.asm @@ -1,13 +1,13 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -19,8 +19,8 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) SU_ENVELOPE MONO,ATTAC(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128) - SU_OSCILLAT MONO,TRANSPOSE(64+4),DETUNE(64),PHASE(64),SAMPLENO(0),SHAPE(64),GAIN(128), FLAGS(SAMPLE) - SU_OSCILLAT MONO,TRANSPOSE(64+2),DETUNE(64),PHASE(64),SAMPLENO(1),SHAPE(64),GAIN(128), FLAGS(SAMPLE) + SU_OSCILLAT MONO,TRANSPOSE(68),DETUNE(64),PHASE(64),SAMPLENO(0),SHAPE(64),GAIN(128), FLAGS(SAMPLE) + SU_OSCILLAT MONO,TRANSPOSE(66),DETUNE(64),PHASE(64),SAMPLENO(1),SHAPE(64),GAIN(128), FLAGS(SAMPLE) SU_MULP STEREO SU_OUT STEREO,GAIN(128) END_INSTRUMENT @@ -39,4 +39,4 @@ BEGIN_SAMPLE_OFFSETS SAMPLE_OFFSET START(1680142),LOOPSTART(1483),LOOPLENGTH(95) ; name VIOLN70, unitynote 58 (transpose to 2), data length 1579 END_SAMPLE_OFFSETS -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_sample_stereo.asm b/tests/test_oscillat_sample_stereo.asm index 7dd5a40..2ecf24b 100644 --- a/tests/test_oscillat_sample_stereo.asm +++ b/tests/test_oscillat_sample_stereo.asm @@ -1,13 +1,13 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -36,4 +36,4 @@ BEGIN_SAMPLE_OFFSETS SAMPLE_OFFSET START(1678611),LOOPSTART(1341),LOOPLENGTH(106) ; name VIOLN68, unitynote 56 (transpose to 4), data length 1448 END_SAMPLE_OFFSETS -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_shapemod.asm b/tests/test_oscillat_shapemod.asm index d21d4fa..ec99845 100644 --- a/tests/test_oscillat_shapemod.asm +++ b/tests/test_oscillat_shapemod.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 @@ -17,9 +17,9 @@ BEGIN_PATCH SU_MULP MONO SU_PUSH MONO SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(68),LOCALPORT(1,4) + SEND_POP + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(4),FLAGS(SEND_POP) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_sine.asm b/tests/test_oscillat_sine.asm index 40f2c72..edee733 100644 --- a/tests/test_oscillat_sine.asm +++ b/tests/test_oscillat_sine.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_stereo.asm b/tests/test_oscillat_stereo.asm index eac9e82..9a9c575 100644 --- a/tests/test_oscillat_stereo.asm +++ b/tests/test_oscillat_stereo.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -20,4 +20,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_transposemod.asm b/tests/test_oscillat_transposemod.asm index 272abcb..ac4eb2b 100644 --- a/tests/test_oscillat_transposemod.asm +++ b/tests/test_oscillat_transposemod.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 80, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0 @@ -17,9 +17,9 @@ BEGIN_PATCH SU_MULP MONO SU_PUSH MONO SU_OSCILLAT MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),FLAGS(SINE + LFO) - SU_SEND MONO,AMOUNT(68),LOCALPORT(1,0) + SEND_POP + SU_SEND MONO,AMOUNT(68),UNIT(1),PORT(0),FLAGS(SEND_POP) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_trisaw.asm b/tests/test_oscillat_trisaw.asm index f17c3e5..4575974 100644 --- a/tests/test_oscillat_trisaw.asm +++ b/tests/test_oscillat_trisaw.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_unison.asm b/tests/test_oscillat_unison.asm index 0e149a0..0ec5405 100644 --- a/tests/test_oscillat_unison.asm +++ b/tests/test_oscillat_unison.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -20,4 +20,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_oscillat_unison_stereo.asm b/tests/test_oscillat_unison_stereo.asm index 9450c4b..fc7cdf3 100644 --- a/tests/test_oscillat_unison_stereo.asm +++ b/tests/test_oscillat_unison_stereo.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -19,4 +19,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_outaux.asm b/tests/test_outaux.asm index 535cfdc..0079321 100644 --- a/tests/test_outaux.asm +++ b/tests/test_outaux.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -23,4 +23,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_outaux_stereo.asm b/tests/test_outaux_stereo.asm index cf5ce4c..41681d0 100644 --- a/tests/test_outaux_stereo.asm +++ b/tests/test_outaux_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -24,4 +24,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_panning.asm b/tests/test_panning.asm index 9bde0e8..ec65e5d 100644 --- a/tests/test_panning.asm +++ b/tests/test_panning.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -18,4 +18,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_panning_stereo.asm b/tests/test_panning_stereo.asm index a47be20..97a6c70 100644 --- a/tests/test_panning_stereo.asm +++ b/tests/test_panning_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -19,4 +19,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_polyphony.asm b/tests/test_polyphony.asm index 32d78d0..681d416 100644 --- a/tests/test_polyphony.asm +++ b/tests/test_polyphony.asm @@ -1,9 +1,9 @@ %define BPM 100 -%include "sointu_header.inc" +%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 @@ -29,4 +29,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_pop.asm b/tests/test_pop.asm index d872c37..d5d5f4d 100644 --- a/tests/test_pop.asm +++ b/tests/test_pop.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -20,4 +20,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_pop_stereo.asm b/tests/test_pop_stereo.asm index b9e3bef..ff0ae7a 100644 --- a/tests/test_pop_stereo.asm +++ b/tests/test_pop_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_push.asm b/tests/test_push.asm index 07bff2d..4ea4012 100644 --- a/tests/test_push.asm +++ b/tests/test_push.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -20,4 +20,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_push_stereo.asm b/tests/test_push_stereo.asm index 4df4c98..8a657af 100644 --- a/tests/test_push_stereo.asm +++ b/tests/test_push_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -21,4 +21,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_receive.asm b/tests/test_receive.asm index 3cbb62d..fff4c4c 100644 --- a/tests/test_receive.asm +++ b/tests/test_receive.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -13,14 +13,14 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) ; should receive -0.5 - SU_SEND MONO,AMOUNT(128),LOCALPORT(5,0) ; should send -0.25 - SU_SEND MONO,AMOUNT(128),LOCALPORT(6,0) + SEND_POP ; should send -0.25 + SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),FLAGS(NONE) ; should send -0.25 + SU_SEND MONO,AMOUNT(128),UNIT(6),PORT(0),FLAGS(SEND_POP) ; should send -0.25 SU_LOADVAL MONO,VALUE(128) ; should receive 1 - SU_SEND MONO,AMOUNT(128),LOCALPORT(6,0) + SEND_POP ; should send 0.5 + SU_SEND MONO,AMOUNT(128),UNIT(6),PORT(0),FLAGS(SEND_POP) ; should send 0.5 SU_RECEIVE MONO ; should receive -0.5 SU_RECEIVE MONO ; should receive 0.5 SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_receive_stereo.asm b/tests/test_receive_stereo.asm index 3cfef03..44226b2 100644 --- a/tests/test_receive_stereo.asm +++ b/tests/test_receive_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -13,13 +13,13 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) ; should receive -0.5 - SU_SEND MONO,AMOUNT(128),LOCALPORT(5,1) ; should send -0.25 - SU_SEND MONO,AMOUNT(128),LOCALPORT(5,0) + SEND_POP ; should send -0.25 + SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(1),FLAGS(NONE) ; should send -0.25 + SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),FLAGS(SEND_POP) ; should send -0.25 SU_LOADVAL MONO,VALUE(128) ; should receive 1 - SU_SEND MONO,AMOUNT(128),LOCALPORT(5,0) + SEND_POP ; should send 0.5 + SU_SEND MONO,AMOUNT(128),UNIT(5),PORT(0),FLAGS(SEND_POP) ; should send 0.5 SU_RECEIVE STEREO; should receive 0.5 -0.5 SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_render_samples.c b/tests/test_render_samples.c index 2f31c28..ed32ae9 100644 --- a/tests/test_render_samples.c +++ b/tests/test_render_samples.c @@ -1,7 +1,7 @@ #include #include #include -#include "sointu.h" +#include #if UINTPTR_MAX == 0xffffffff // are we 32-bit? #if defined(__clang__) || defined(__GNUC__) diff --git a/tests/test_render_samples_api.c b/tests/test_render_samples_api.c index 86658f7..9a5f382 100644 --- a/tests/test_render_samples_api.c +++ b/tests/test_render_samples_api.c @@ -2,7 +2,7 @@ #include #include #include -#include +#include #define BPM 100 #define SAMPLE_RATE 44100 diff --git a/tests/test_send.asm b/tests/test_send.asm index 802c1f4..94b8996 100644 --- a/tests/test_send.asm +++ b/tests/test_send.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -13,14 +13,14 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(32) ; should receive -0.5 - SU_SEND MONO,AMOUNT(96),LOCALPORT(5,0) ; should send -0.25 - SU_SEND MONO,AMOUNT(96),LOCALPORT(6,0) + SEND_POP ; should send -0.25 + SU_SEND MONO,AMOUNT(96),UNIT(5),PORT(0),FLAGS(NONE) ; should send -0.25 + SU_SEND MONO,AMOUNT(96),UNIT(6),PORT(0),FLAGS(SEND_POP) ; should send -0.25 SU_LOADVAL MONO,VALUE(128) ; should receive 1 - SU_SEND MONO,AMOUNT(96),LOCALPORT(6,0) + SEND_POP ; should send 0.5 + SU_SEND MONO,AMOUNT(96),UNIT(6),PORT(0),FLAGS(SEND_POP) ; should send 0.5 SU_LOADVAL MONO,VALUE(64) ; should receive -0.5 SU_LOADVAL MONO,VALUE(64) ; should receive 0.5 SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_send_global.asm b/tests/test_send_global.asm index 9c0c23d..b83dc94 100644 --- a/tests/test_send_global.asm +++ b/tests/test_send_global.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -13,18 +13,18 @@ END_TRACKS BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(96) - SU_SEND MONO,AMOUNT(96),GLOBALPORT(1,3,0) + SEND_POP + SU_SEND MONO,AMOUNT(96),VOICE(1),UNIT(3),PORT(0),FLAGS(SEND_POP) SU_LOADVAL MONO,VALUE(64) SU_LOADVAL MONO,VALUE(64) SU_OUT STEREO,GAIN(128) END_INSTRUMENT BEGIN_INSTRUMENT VOICES(1) ; Instrument1 SU_LOADVAL MONO,VALUE(32) - SU_SEND MONO,AMOUNT(96),GLOBALPORT(0,2,0) + SEND_POP + SU_SEND MONO,AMOUNT(96),VOICE(0),UNIT(2),PORT(0),FLAGS(SEND_POP) SU_LOADVAL MONO,VALUE(64) SU_LOADVAL MONO,VALUE(64) SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_send_stereo.asm b/tests/test_send_stereo.asm index fc89f25..15b5b35 100644 --- a/tests/test_send_stereo.asm +++ b/tests/test_send_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -14,13 +14,13 @@ BEGIN_PATCH BEGIN_INSTRUMENT VOICES(1) ; Instrument0 SU_LOADVAL MONO,VALUE(0) SU_LOADVAL MONO,VALUE(0) - SU_SEND STEREO,AMOUNT(96),LOCALPORT(6,0) + SEND_POP + SU_SEND STEREO,AMOUNT(96),UNIT(6),PORT(0),FLAGS(SEND_POP) SU_LOADVAL MONO,VALUE(64) SU_LOADVAL MONO,VALUE(128) - SU_SEND STEREO,AMOUNT(128),LOCALPORT(6,0) + SEND_POP + SU_SEND STEREO,AMOUNT(128),UNIT(6),PORT(0),FLAGS(SEND_POP) SU_RECEIVE STEREO; should receive 0.5 -0.5 SU_OUT STEREO,GAIN(128) END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_speed.asm b/tests/test_speed.asm index 910b50d..e208ae8 100644 --- a/tests/test_speed.asm +++ b/tests/test_speed.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" ; warning: crashes ahead. Now that the bpm could be changed and even modulated by other ; signals, there is no easy way to figure out how many ticks your song is. Either @@ -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 @@ -33,4 +33,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_xch.asm b/tests/test_xch.asm index 44905ea..c8803c4 100644 --- a/tests/test_xch.asm +++ b/tests/test_xch.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -19,4 +19,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc" diff --git a/tests/test_xch_stereo.asm b/tests/test_xch_stereo.asm index e2ca928..b835845 100644 --- a/tests/test_xch_stereo.asm +++ b/tests/test_xch_stereo.asm @@ -1,6 +1,6 @@ %define BPM 100 -%include "sointu_header.inc" +%include "sointu/header.inc" BEGIN_PATTERNS PATTERN 64, HLD, HLD, HLD, HLD, HLD, HLD, HLD, 0, 0, 0, 0, 0, 0, 0, 0 @@ -23,4 +23,4 @@ BEGIN_PATCH END_INSTRUMENT END_PATCH -%include "sointu_footer.inc" +%include "sointu/footer.inc"