prepare for win release

Author: 2bt

CMakeLists.txt

@@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 3.7)
 project(sid-monitor)
 
 add_compile_options(-std=c++17 -Wall -Ofast)
+#add_compile_options(-std=c++17 -Wall -Og -g)
 
 find_package(SDL2 REQUIRED)
 include_directories(${SDL2_INCLUDE_DIRS})

README.md

@@ -1,4 +1,4 @@
-SID monitor
+SID Monitor
 ===========
 
 A SID player with piano-roll-like visualization.

src/fx.cpp

@@ -1,7 +1,9 @@
-#include <SDL2/SDL.h>
 #include <vector>
+#include <cstdio>
+#include <SDL2/SDL.h>
 #include "fx.hpp"
 
+
 namespace fx {
 namespace {
 

src/main.cpp

@@ -1,5 +1,7 @@
 #include <cstdio>
 #include <chrono>
+#include <cmath>
+#define SDL_MAIN_HANDLED
 #include <SDL2/SDL.h>
 #include "record.hpp"
 #include "fx.hpp"
@@ -8,7 +10,7 @@
 
 enum {
     MIXRATE           = 44100,
-    BUFFER_SIZE       = MIXRATE / 50,
+    BUFFER_SIZE       = 1024,
     CHANNEL_COUT      = 3,
 };
 
@@ -292,7 +294,7 @@ struct App : fx::App {
         fx::printf(8, 8 + 24, "%s", record.song_author.c_str());
         fx::printf(8, 8 + 48, "%s", record.song_released.c_str());
 
-        fx::printf(fx::screen_width() - 8 - 16 * 14, 8 + 24 * 0, " speed:     %dX", record.speed);
+        fx::printf(fx::screen_width() - 8 - 16 * 14, 8 + 24 * 0, " speed:  %4.gX", record.speed);
         fx::printf(fx::screen_width() - 8 - 16 * 14, 8 + 24 * 1, "  time:  %02d:%02d", frame / framerate / 60, frame / framerate % 60);
         fx::printf(fx::screen_width() - 8 - 16 * 14, 8 + 24 * 2, "   pos: %6d", f);
         fx::printf(fx::screen_width() - 8 - 16 * 14, 8 + 24 * 3, "   bar: %6d", bar);

src/record.cpp

@@ -1,5 +1,6 @@
 #include <fstream>
 #include <cstring>
+#include <cmath>
 #include "record.hpp"
 #include "cpu.hpp"
 
@@ -143,7 +144,9 @@ bool Record::load(const char* filename, int nr) {
     // check timer
     if (song_nr < 32 && ((h->speed >> (song_nr - 1)) & 1)) {
         int timer = (cpu.ram[0xdc05] << 8) | cpu.ram[0xdc04];
-        speed = (19656 + timer / 2) / timer;
+//        speed = (19656 + timer / 2) / timer;
+//        speed = 19656.0f / timer;
+        speed = round(19656 * 2.0f / timer) / 2;
     }
     else {
         speed = 1;

src/record.hpp

@@ -19,7 +19,7 @@ struct Record {
     std::string        song_released;
     int                song_count;
     int                song_nr;
-    int                speed;
+    float              speed;
 
     bool load(const char* filename, int song_nr = 0);
 };

src/sidengine.cpp

@@ -42,16 +42,6 @@ class TinySidEngine : public SidEngine {
 
 private:
 
-    constexpr static std::array<int, 16> attack_speeds = {
-        168867, 47495, 24124, 15998, 10200, 6908, 5692, 4855,
-        3877, 1555, 777, 486, 389, 129, 77, 48,
-    };
-
-    constexpr static std::array<int, 16> release_speeds = {
-        42660, 15468, 7857, 5210, 3322, 2250, 1853, 1581,
-        1262, 506, 253, 158, 126, 42, 25, 15,
-    };
-
     enum {
         CHANNEL_COUNT = 3
     };
@@ -108,13 +98,23 @@ void TinySidEngine::update_registers(uint8_t const* regs) {
         Channel& chan = m_channels[i];
         uint8_t const* r = regs + (i * 7);
 
+        static const std::array<int, 16> ATTACK_SPEEDS = {
+            168867, 47495, 24124, 15998, 10200, 6908, 5692, 4855,
+            3877, 1555, 777, 486, 389, 129, 77, 48,
+        };
+
+        static const std::array<int, 16> RELEASE_SPEEDS = {
+            42660, 15468, 7857, 5210, 3322, 2250, 1853, 1581,
+            1262, 506, 253, 158, 126, 42, 25, 15,
+        };
+
         chan.freq            = (r[0] | (r[1] << 8)) * (15872000 / MIXRATE);
         chan.next_pulsewidth = (r[2] | ((r[3] & 15) << 8)) << 16;
         chan.flags           = r[4];
-        chan.adsr[0]         = attack_speeds[r[5] >> 4];
-        chan.adsr[1]         = release_speeds[r[5] & 15];
+        chan.adsr[0]         = ATTACK_SPEEDS[r[5] >> 4];
+        chan.adsr[1]         = RELEASE_SPEEDS[r[5] & 15];
         chan.adsr[2]         = (r[6] >> 4) * 0x111111;
-        chan.adsr[3]         = release_speeds[r[6] & 15];
+        chan.adsr[3]         = RELEASE_SPEEDS[r[6] & 15];
         chan.filter          = (regs[23] >> i) & 1;
     }