Embed SoundUnit in SGU

Author: smokku

src/chips/sgu1.cc

@@ -34,16 +34,15 @@ void sgu1_init(sgu1_t* sgu, const sgu1_desc_t* desc) {
     sgu->sample_counter = sgu->sample_period;
     sgu->sample_mag = desc->magnitude;
     // sgu->sample_accum_count[0] = sgu->sample_accum_count[1] = 1.0f;
-    sgu->su = new SoundUnit();
     sgu->tick_period = (desc->tick_hz * SGU1_FIXEDPOINT_SCALE) / (CHIP_CLOCK / CHIP_DIVIDER);
     sgu->tick_counter = sgu->tick_period;
-    SoundUnit_Init(sgu->su, 65536, false);
+    SoundUnit_Init(&sgu->su, 65536, false);
     sgu->resampler = speex_resampler_init(SGU1_AUDIO_CHANNELS, CHIP_CLOCK / CHIP_DIVIDER, sgu->sound_hz, 10, nullptr);
 }
 
 void sgu1_reset(sgu1_t* sgu) {
     CHIPS_ASSERT(sgu);
-    SoundUnit_Reset(sgu->su);
+    SoundUnit_Reset(&sgu->su);
     memset(sgu->reg, 0, sizeof(sgu->reg));
     sgu->tick_counter = sgu->tick_period;
     sgu->sample_counter = sgu->sample_period;
@@ -59,14 +58,14 @@ static uint64_t _sgu1_tick(sgu1_t* sgu, uint64_t pins) {
     if (sgu->tick_counter <= 0) {
         sgu->tick_counter += sgu->tick_period;
         short l, r;
-        SoundUnit_NextSample(sgu->su, &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++) {
-            sgu->voice[i].sample_buffer[sgu->voice[i].sample_pos++] = (float)SoundUnit_GetSample(sgu->su, 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;
             }
@@ -98,7 +97,7 @@ uint8_t sgu1_reg_read(sgu1_t* sgu, uint8_t reg) {
     }
     else {
         uint8_t chan = _sgu1_selected_channel(sgu);
-        data = ((unsigned char*)sgu->su->chan)[chan << 5 | (reg & (SGU1_NUM_CHANNEL_REGS - 1))];
+        data = ((unsigned char*)sgu->su.chan)[chan << 5 | (reg & (SGU1_NUM_CHANNEL_REGS - 1))];
     }
     return data;
 }
@@ -111,7 +110,7 @@ void sgu1_reg_write(sgu1_t* sgu, uint8_t reg, uint8_t data) {
     }
     else {
         uint8_t chan = _sgu1_selected_channel(sgu);
-        ((unsigned char*)sgu->su->chan)[chan << 5 | (reg & (SGU1_NUM_CHANNEL_REGS - 1))] = data;
+        ((unsigned char*)sgu->su.chan)[chan << 5 | (reg & (SGU1_NUM_CHANNEL_REGS - 1))] = data;
     }
 }
 

src/chips/sgu1.h

@@ -179,7 +179,7 @@ typedef struct {
 typedef struct {
     int sound_hz;
     // sound unit instance
-    SoundUnit* su;
+    SoundUnit su;
     uint8_t reg[32];
     int tick_period;
     int tick_counter;

src/ui/ui_sgu1.cc

@@ -40,7 +40,7 @@ static void ui_util_s8(int8_t val) {
 
 static void _ui_sgu1_draw_state(ui_sgu1_t* win) {
     sgu1_t* sgu = win->sgu;
-    SoundUnit* su = static_cast<SoundUnit*>(sgu->su);
+    SoundUnit* su = &sgu->su;
     const float cw0 = 158.0f;
     const float cw = 62.0f;
     const float h = ImGui::GetTextLineHeight();