Memory::config.saveRoms was not saved in snapshots

Author: dirkwhoffmann

Emulator/Components/Memory/Memory.cpp

@@ -318,14 +318,17 @@ Memory::operator << (SerChecker &worker)
     if (config.fastSize) {
         for (isize i = 0; i < config.fastSize; i++) worker << fast[i];
     }
-    if (romAllocator.size) {
-        for (isize i = 0; i < romAllocator.size; i++) worker << rom[i];
-    }
-    if (womAllocator.size) {
-        for (isize i = 0; i < womAllocator.size; i++) worker << wom[i];
-    }
-    if (extAllocator.size) {
-        for (isize i = 0; i < extAllocator.size; i++) worker << ext[i];
+    if (config.saveRoms) {
+
+        if (romAllocator.size) {
+            for (isize i = 0; i < romAllocator.size; i++) worker << rom[i];
+        }
+        if (womAllocator.size) {
+            for (isize i = 0; i < womAllocator.size; i++) worker << wom[i];
+        }
+        if (extAllocator.size) {
+            for (isize i = 0; i < extAllocator.size; i++) worker << ext[i];
+        }
     }
 }
 

Emulator/Components/Memory/Memory.h

@@ -280,6 +280,7 @@ class Memory final : public SubComponent, public Inspectable<MemInfo, MemStats>
         << chipMask
 
         << config.extStart
+        << config.saveRoms
         << config.slowRamDelay
         << config.slowRamMirror
         << config.bankMap

Emulator/Components/Ports/AudioPort.cpp

@@ -435,10 +435,8 @@ AudioPort::handleBufferUnderflow()
     //
     // (1) The consumer runs slightly faster than the producer
     // (2) The producer is halted or not startet yet
-    
-    // debug(AUDBUF_DEBUG, "UNDERFLOW (r: %ld w: %ld)\n", stream.r, stream.w);
 
-    // Reset the write pointer
+    // Wipe out the buffer and reset the write pointer
     stream.clear(SamplePair{0,0});
     stream.alignWritePtr();
 
@@ -466,8 +464,6 @@ AudioPort::handleBufferOverflow()
     // (1) The consumer runs slightly slower than the producer
     // (2) The consumer is halted or not startet yet
 
-    // debug(AUDBUF_DEBUG, "OVERFLOW (r: %ld w: %ld)\n", stream.r, stream.w);
-
     // Reset the write pointer
     stream.alignWritePtr();
 
@@ -507,13 +503,13 @@ AudioPort::copyMono(float *buffer, isize n)
 }
 
 isize
-AudioPort::copyStereo(float *buffer1, float *buffer2, isize n)
+AudioPort::copyStereo(float *left, float *right, isize n)
 {
     // Inform the sample rate detector about the number of requested samples
     detector.feed(n);
 
     // Copy sound samples
-    auto cnt = stream.copyStereo(buffer1, buffer2, n);
+    auto cnt = stream.copyStereo(left, right, n);
     stats.consumedSamples += cnt;
 
     // Check for a buffer underflow

Emulator/Components/Ports/AudioPort.h

@@ -123,7 +123,7 @@ class AudioPort final : public SubComponent {
         Sampler()
     };
 
-    // Output
+    // Output buffer
     AudioStream stream;
 
     // The audio filter pipeline

Emulator/Utilities/Animated.h

@@ -22,7 +22,7 @@ template <typename T> struct Animated {
     // Current value
     double current = 1.0;
 
-    // Maximum volume
+    // Maximum value
     double maximum = 1.0;
 
     // Fading direction and speed