cleanup

dirkwhoffmann · Aug 1, 2024 · f4bb769 · f4bb769
1 parent f29e5ed
commit f4bb769
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/Emulator/Base/Configurable.h b/Emulator/Base/Configurable.h
@@ -34,7 +34,7 @@ class Configurable
     virtual i64 getOption(Option opt) const { return 0; }
 
     // Gets the fallback for a config option
-    virtual i64 getFallback(Option opt) const { return 0; }
+    virtual i64 getFallback(Option opt) const = 0;
 
     // Throws an exception of if the given option/value pair is invalid
     virtual void checkOption(Option opt, i64 value) { }

diff --git a/Emulator/Base/CoreComponent.cpp b/Emulator/Base/CoreComponent.cpp
@@ -139,6 +139,12 @@ CoreComponent::routeOption(Option opt, isize objid)
     return nullptr;
 }
 
+i64
+CoreComponent::getFallback(Option opt) const
+{
+    return emulator.defaults.get(opt);
+}
+
 void
 CoreComponent::initialize()
 {

diff --git a/Emulator/Base/CoreComponent.h b/Emulator/Base/CoreComponent.h
@@ -11,7 +11,6 @@
 
 #include "CoreComponentTypes.h"
 #include "EmulatorTypes.h"
-#include "ThreadTypes.h"
 #include "CoreObject.h"
 #include "Inspectable.h"
 #include "Synchronizable.h"
@@ -119,6 +118,9 @@ public CoreObject, public Serializable, public Suspendable, public Synchronizabl
     // Returns the target component for a given configuration option
     Configurable *routeOption(Option opt, isize objid);
 
+    // Returns the fallback value for a config option
+    i64 getFallback(Option opt) const override;
+
 
     //
     // Controlling the state
@@ -127,7 +129,6 @@ public CoreObject, public Serializable, public Suspendable, public Synchronizabl
 public:
 
     void initialize();
-    void reset(bool hard);
     void powerOn();
     void powerOff();
     void run();
@@ -140,23 +141,18 @@ public CoreObject, public Serializable, public Suspendable, public Synchronizabl
     void focus();
     void unfocus();
 
-    void hardReset() { reset(true); }
-    void softReset() { reset(false); }
-
     void powerOnOff(bool value) { value ? powerOn() : powerOff(); }
     void warpOnOff(bool value) { value ? warpOn() : warpOff(); }
     void trackOnOff(bool value) { value ? trackOn() : trackOff(); }
 
 
     //
-    // Processing state changes
+    // Performing state changes
     //
 
 private:
 
     virtual void _initialize() { }
-    virtual void _willReset(bool hard) { }
-    virtual void _didReset(bool hard) { }
     virtual void _isReady() const throws { }
     virtual void _powerOn() { }
     virtual void _powerOff() { }
@@ -180,13 +176,20 @@ public CoreObject, public Serializable, public Suspendable, public Synchronizabl
     // Returns the size of the internal state in bytes
     isize size();
 
+    // Resets the internal state
+    void hardReset() { reset(true); }
+    void softReset() { reset(false); }
+    void reset(bool hard);
+    virtual void _willReset(bool hard) { }
+    virtual void _didReset(bool hard) { }
+
     // Loads the internal state from a memory buffer
     virtual isize load(const u8 *buf) throws;
-    virtual void _didLoad() { };
+    virtual void _didLoad() { }
 
     // Saves the internal state to a memory buffer
     virtual isize save(u8 *buf);
-    virtual void _didSave() { };
+    virtual void _didSave() { }
 
 
     //

diff --git a/Emulator/Components/EmulatorTypes.h b/Emulator/Components/EmulatorTypes.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "Reflection.h"
+#include "ThreadTypes.h"
 #include "AmigaTypes.h"
 
 // namespace vamiga {