Use SGU from firmware source

Author: smokku

CMakeLists.txt

@@ -31,6 +31,7 @@ add_subdirectory(src/common)
 include_directories(src/common)
 include_directories(ext/firmware/src/south)
 include_directories(ext/firmware/src/north)
+include_directories(ext/firmware/src/audio)
 add_executable(emu
     src/chips/pwm.c
     src/chips/cgia.c
@@ -49,7 +50,7 @@ add_executable(emu
     src/ui/ui_app_log.cc
     src/ui/ui_x65.cc
     src/util/ringbuffer.c
-    src/chips/su/su.c
+    ext/firmware/src/audio/snd/su.c
     ${CMAKE_CURRENT_BINARY_DIR}/version.c
 )
 target_link_libraries(emu

src/chips/sgu1.c

@@ -29,7 +29,7 @@ void sgu1_init(sgu1_t* sgu, const sgu1_desc_t* desc) {
     sgu->sample_mag = desc->magnitude;
     sgu->tick_period = (desc->tick_hz * SGU1_FIXEDPOINT_SCALE) / SGU1_CHIP_CLOCK;
     sgu->tick_counter = sgu->tick_period;
-    SoundUnit_Init(&sgu->su, 65536, false);
+    SoundUnit_Init(&sgu->su, 65536);
     sgu->resampler = speex_resampler_init(SGU1_AUDIO_CHANNELS, SGU1_CHIP_CLOCK, sgu->sound_hz, 10, nullptr);
 }
 
@@ -50,14 +50,14 @@ static uint64_t _sgu1_tick(sgu1_t* sgu, uint64_t pins) {
     sgu->tick_counter -= SGU1_FIXEDPOINT_SCALE;
     if (sgu->tick_counter <= 0) {
         sgu->tick_counter += sgu->tick_period;
-        short l, r;
+        int32_t l, r;
         SoundUnit_NextSample(&sgu->su, &l, &r);
         float in[2] = { ((float)l / 32767.0f), ((float)r / 32767.0f) };
         spx_uint32_t in_len = 1;   // 1 stereo frame
         spx_uint32_t out_len = 1;  // room for 1 stereo frame
         speex_resampler_process_interleaved_float(sgu->resampler, in, &in_len, sgu->sample, &out_len);
 
-        for (int i = 0; i < SGU1_NUM_CHANNELS; i++) {
+        for (uint8_t i = 0; i < SGU1_NUM_CHANNELS; i++) {
             sgu->voice[i].sample_buffer[sgu->voice[i].sample_pos++] = (float)(SoundUnit_GetSample(&sgu->su, i));
             if (sgu->voice[i].sample_pos >= SGU1_AUDIO_SAMPLES) {
                 sgu->voice[i].sample_pos = 0;

src/chips/sgu1.h

@@ -45,7 +45,7 @@
 #include <speex_resampler.h>
 #include <stdint.h>
 #include <stdbool.h>
-#include "./su/su.h"
+#include "snd/su.h"
 
 #ifdef __cplusplus
 extern "C" {