MIDI tweaks

obsidian-level-maker · Jun 25, 2024 · 148ac77 · 148ac77
1 parent 4f4f7ea
commit 148ac77
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/libraries/steve/src/ConfigItemList.h b/libraries/steve/src/ConfigItemList.h
@@ -5,6 +5,7 @@
 
 #include "Chord.h"
 #include "Instrument.h"
+#include "Rand.h"
 #include "Scale.h"
 
 namespace steve {

diff --git a/libraries/steve/src/Music.cpp b/libraries/steve/src/Music.cpp
@@ -41,7 +41,7 @@ Music::Music(const Config& config)
       for(NoteValue j = get_beat_value(); j >= NoteValue(0); j = NoteValue(uint32_t(j) - 1)) {
         const auto ticks = ticks_for(j);
         if((i / ticks) * ticks == i) {
-          if(Rand::next(0ul, (uint32_t(get_beat_value()) - uint32_t(j)) * 2) == 0) {
+          if(Rand::next(0u, (uint32_t(get_beat_value()) - uint32_t(j)) * 2) == 0) {
             _beats[i] = true;
             break;
           }

diff --git a/libraries/steve/src/Rand.cpp b/libraries/steve/src/Rand.cpp
@@ -4,7 +4,7 @@
 
 using namespace steve;
 
-std::default_random_engine Rand::generator;
+std::mt19937_64 Rand::generator;
 static std::uniform_real_distribution<float> nf_dist(0.f, 1.f);
 static std::normal_distribution<float> nn_dist(0.5f, 0.1f);
 

diff --git a/libraries/steve/src/Rand.h b/libraries/steve/src/Rand.h
@@ -10,7 +10,7 @@
 namespace steve {
   class Rand {
   public:
-    static std::default_random_engine generator;
+    static std::mt19937_64 generator;
     static float next_float();
     static float next_normal();
 

diff --git a/libraries/steve/src/Steve.cpp b/libraries/steve/src/Steve.cpp
@@ -2,6 +2,7 @@
 
 #include <iostream>
 #include <cassert>
+#include <cstring>
 
 #include "Chord.h"
 

diff --git a/libraries/steve/src/Steve.h b/libraries/steve/src/Steve.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <map>
 #include <set>
 #include <vector>