feat(sointu): remove 16-bit output toggle from song; make it compile time option

2026-04-03 04:32:55 -04:00 · 2021-01-05 18:08:13 +02:00
parent 30379c981d
commit 588488ce54
98 changed files with 48 additions and 140 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -1,13 +1,18 @@
 function(regression_test testname)

-    if(${ARGC} LESS 4)
-        set(source ${testname}.yml)
+    if(${ARGC} LESS 6)
+        if(${ARGC} LESS 4)
+            set(source ${testname}.yml)
+        else()
+            set(source ${ARGV3}.yml)
+        endif()
+        
        set(asmfile ${testname}.asm)
        set (headerfile ${CMAKE_CURRENT_BINARY_DIR}/${testname}.h)

        add_custom_command(
            OUTPUT ${asmfile}
-            COMMAND ${compilecmd} -arch=${arch} -o ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${source}
+            COMMAND ${compilecmd} ${ARGV4} -arch=${arch} -o ${CMAKE_CURRENT_BINARY_DIR}/${asmfile} ${CMAKE_CURRENT_SOURCE_DIR}/${source}
            DEPENDS ${source} ${x86templates} sointu-compiler
        )

@ -19,14 +24,14 @@ function(regression_test testname)
            set(watfile ${CMAKE_CURRENT_BINARY_DIR}/${testname}.wat)
            set(wasmtarget wasm_${testname})
            add_custom_target(${wasmtarget} ALL
-                COMMAND ${compilecmd} -arch=wasm -o ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${source} && ${WAT2WASM} --enable-bulk-memory -o ${wasmfile} ${watfile}
+                COMMAND ${compilecmd} -arch=wasm -o ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_CURRENT_SOURCE_DIR}/${source} && ${WAT2WASM} --enable-bulk-memory -o ${wasmfile} ${watfile}
                SOURCES "${source}" "${wasmtemplates}"
                DEPENDS sointu-compiler
            )
            add_test(${wasmtarget} ${NODE} ${CMAKE_CURRENT_SOURCE_DIR}/wasm_test_renderer.es6 ${wasmfile} ${CMAKE_CURRENT_SOURCE_DIR}/expected_output/${testname}.raw)
        endif()
    else()
-        set(source ${ARGV3})
+        set(source ${ARGV5})
        add_executable(${testname} ${source} test_renderer.c)
    endif()

@ -155,13 +160,13 @@ 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_envelope_mod "VCO_SINE;ENVELOPE;SEND")
-regression_test(test_envelope_16bit ENVELOPE)
+regression_test(test_envelope_16bit ENVELOPE "" test_envelope "-i")

 regression_test(test_polyphony "ENVELOPE;VCO_SINE")
 regression_test(test_chords "ENVELOPE;VCO_SINE")
 regression_test(test_speed "ENVELOPE;VCO_SINE")

-regression_test(test_render_samples ENVELOPE "" test_render_samples.c)
+regression_test(test_render_samples ENVELOPE "" "" "" test_render_samples.c)
 target_link_libraries(test_render_samples ${STATICLIB})
 target_compile_definitions(test_render_samples PUBLIC TEST_HEADER="test_render_samples.h")

--- a/tests/test_add.yml
+++ b/tests/test_add.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_add_stereo.yml
+++ b/tests/test_add_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_addp.yml
+++ b/tests/test_addp.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_addp_stereo.yml
+++ b/tests/test_addp_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_aux.yml
+++ b/tests/test_aux.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_aux_stereo.yml
+++ b/tests/test_aux_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_chords.yml
+++ b/tests/test_chords.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_clip.yml
+++ b/tests/test_clip.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_clip_stereo.yml
+++ b/tests/test_clip_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_compressor.yml
+++ b/tests/test_compressor.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_compressor_stereo.yml
+++ b/tests/test_compressor_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_crush.yml
+++ b/tests/test_crush.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_crush_stereo.yml
+++ b/tests/test_crush_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay.yml
+++ b/tests/test_delay.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_dampmod.yml
+++ b/tests/test_delay_dampmod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_drymod.yml
+++ b/tests/test_delay_drymod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_feedbackmod.yml
+++ b/tests/test_delay_feedbackmod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_flanger.yml
+++ b/tests/test_delay_flanger.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_notetracking.yml
+++ b/tests/test_delay_notetracking.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_pregainmod.yml
+++ b/tests/test_delay_pregainmod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_reverb.yml
+++ b/tests/test_delay_reverb.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_delay_stereo.yml
+++ b/tests/test_delay_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_distort.yml
+++ b/tests/test_distort.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_distort_mod.yml
+++ b/tests/test_distort_mod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_distort_stereo.yml
+++ b/tests/test_distort_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_envelope.yml
+++ b/tests/test_envelope.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_envelope_16bit.yml
+++ b/tests/test_envelope_16bit.yml
@ -1,16 +0,0 @@
-bpm: 100
-output16bit: true
-tracks:
-    - numvoices: 1
-      sequence: [0]
-      patterns: [[64, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0]]
-patch:
-    instruments:
-        - numvoices: 1
-          units:
-            - type: envelope
-              parameters: {attack: 64, decay: 64, gain: 128, release: 80, stereo: 0, sustain: 64}
-            - type: envelope
-              parameters: {attack: 95, decay: 64, gain: 128, release: 80, stereo: 0, sustain: 64}
-            - type: out
-              parameters: {gain: 128, stereo: 1}
--- a/tests/test_envelope_mod.yml
+++ b/tests/test_envelope_mod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_envelope_stereo.yml
+++ b/tests/test_envelope_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_band.yml
+++ b/tests/test_filter_band.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_freqmod.yml
+++ b/tests/test_filter_freqmod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_high.yml
+++ b/tests/test_filter_high.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_low.yml
+++ b/tests/test_filter_low.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_peak.yml
+++ b/tests/test_filter_peak.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_resmod.yml
+++ b/tests/test_filter_resmod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_filter_stereo.yml
+++ b/tests/test_filter_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_gain.yml
+++ b/tests/test_gain.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_gain_stereo.yml
+++ b/tests/test_gain_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_hold.yml
+++ b/tests/test_hold.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_hold_mod.yml
+++ b/tests/test_hold_mod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_hold_stereo.yml
+++ b/tests/test_hold_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_in.yml
+++ b/tests/test_in.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_in_stereo.yml
+++ b/tests/test_in_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_invgain.yml
+++ b/tests/test_invgain.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_invgain_stereo.yml
+++ b/tests/test_invgain_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_loadnote.yml
+++ b/tests/test_loadnote.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_loadnote_stereo.yml
+++ b/tests/test_loadnote_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_loadval.yml
+++ b/tests/test_loadval.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_loadval_stereo.yml
+++ b/tests/test_loadval_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_mul.yml
+++ b/tests/test_mul.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_mul_stereo.yml
+++ b/tests/test_mul_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_mulp.yml
+++ b/tests/test_mulp.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_mulp_stereo.yml
+++ b/tests/test_mulp_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_multiple_instruments.yml
+++ b/tests/test_multiple_instruments.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_noise.yml
+++ b/tests/test_noise.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_noise_stereo.yml
+++ b/tests/test_noise_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_colormod.yml
+++ b/tests/test_oscillat_colormod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_detunemod.yml
+++ b/tests/test_oscillat_detunemod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_gainmod.yml
+++ b/tests/test_oscillat_gainmod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_gate.yml
+++ b/tests/test_oscillat_gate.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_lfo.yml
+++ b/tests/test_oscillat_lfo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_phasemod.yml
+++ b/tests/test_oscillat_phasemod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_pulse.yml
+++ b/tests/test_oscillat_pulse.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_sample.yml
+++ b/tests/test_oscillat_sample.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [1, 0, 2, 0, 3, 0, 4, 0]
--- a/tests/test_oscillat_sample_stereo.yml
+++ b/tests/test_oscillat_sample_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [1, 0, 2, 0, 3, 0, 4, 0]
--- a/tests/test_oscillat_shapemod.yml
+++ b/tests/test_oscillat_shapemod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_sine.yml
+++ b/tests/test_oscillat_sine.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_stereo.yml
+++ b/tests/test_oscillat_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_transposemod.yml
+++ b/tests/test_oscillat_transposemod.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_trisaw.yml
+++ b/tests/test_oscillat_trisaw.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_unison.yml
+++ b/tests/test_oscillat_unison.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_oscillat_unison_stereo.yml
+++ b/tests/test_oscillat_unison_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_outaux.yml
+++ b/tests/test_outaux.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_outaux_stereo.yml
+++ b/tests/test_outaux_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_panning.yml
+++ b/tests/test_panning.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_panning_stereo.yml
+++ b/tests/test_panning_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_polyphony.yml
+++ b/tests/test_polyphony.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 2
      sequence: [0]
--- a/tests/test_pop.yml
+++ b/tests/test_pop.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_pop_stereo.yml
+++ b/tests/test_pop_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_push.yml
+++ b/tests/test_push.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_push_stereo.yml
+++ b/tests/test_push_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_receive.yml
+++ b/tests/test_receive.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_receive_stereo.yml
+++ b/tests/test_receive_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_send.yml
+++ b/tests/test_send.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_send_global.yml
+++ b/tests/test_send_global.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_send_stereo.yml
+++ b/tests/test_send_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_speed.yml
+++ b/tests/test_speed.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0, 0]
--- a/tests/test_xch.yml
+++ b/tests/test_xch.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]
--- a/tests/test_xch_stereo.yml
+++ b/tests/test_xch_stereo.yml
@ -1,5 +1,4 @@
 bpm: 100
-output16bit: false
 tracks:
    - numvoices: 1
      sequence: [0]