Removed local calls to CoreComponent::_initialize()

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

Hide file tree

Showing 12 changed files with 4 additions and 26 deletions.
diff --git a/Emulator/Base/CoreComponent.h b/Emulator/Base/CoreComponent.h
@@ -152,7 +152,7 @@ public CoreObject, public Serializable, public Suspendable, public Synchronizabl
     // Processing state changes
     //
 
-public:
+private:
 
     virtual void _initialize() { }
     virtual void _willReset(bool hard) { }

diff --git a/Emulator/Components/Agnus/Blitter/Blitter.cpp b/Emulator/Components/Agnus/Blitter/Blitter.cpp
@@ -23,9 +23,7 @@ Blitter::Blitter(Amiga& ref) : SubComponent(ref)
 
 void
 Blitter::_initialize()
-{
-    CoreComponent::_initialize();
-
+{    
     // Initialize the fill pattern tables
     for (isize carryIn = 0; carryIn < 2; carryIn++) {
 

diff --git a/Emulator/Components/Agnus/Sequencer/Sequencer.cpp b/Emulator/Components/Agnus/Sequencer/Sequencer.cpp
@@ -21,8 +21,6 @@ Sequencer::Sequencer(Amiga& ref) : SubComponent(ref)
 void
 Sequencer::_initialize()
 {
-    CoreComponent::_initialize();
-
     initDasEventTable();
 }
 

diff --git a/Emulator/Components/CIA/CIA.cpp b/Emulator/Components/CIA/CIA.cpp
@@ -32,8 +32,6 @@ CIA::CIA(Amiga& ref, isize objid) : SubComponent(ref, objid)
 void
 CIA::_initialize()
 {
-    CoreComponent::_initialize();
-
     pa = 0xFF;
     pb = 0xFF;
 }

diff --git a/Emulator/Components/Denise/DeniseDebugger.cpp b/Emulator/Components/Denise/DeniseDebugger.cpp
@@ -15,9 +15,7 @@ namespace vamiga {
 
 void
 DeniseDebugger::_initialize()
-{
-    CoreComponent::_initialize();
-
+{    
     std::memset(spriteInfo, 0, sizeof(spriteInfo));
     std::memset(latchedSpriteInfo, 0, sizeof(latchedSpriteInfo));
 }

diff --git a/Emulator/Components/Denise/PixelEngine.cpp b/Emulator/Components/Denise/PixelEngine.cpp
@@ -39,8 +39,6 @@ PixelEngine::_dump(Category category, std::ostream& os) const
 void
 PixelEngine::_initialize()
 {
-    CoreComponent::_initialize();
-
     // Setup ECS BRDRBLNK color
     palette[64] = TEXEL(GpuColor(0x00, 0x00, 0x00).rawValue);
 

diff --git a/Emulator/Components/Memory/Memory.cpp b/Emulator/Components/Memory/Memory.cpp
@@ -96,9 +96,7 @@ Memory::_dump(Category category, std::ostream& os) const
 
 void
 Memory::_initialize()
-{
-    CoreComponent::_initialize();
-
+{    
     if (auto romPath = Emulator::defaults.getRaw("ROM_PATH"); romPath != "") {
 
         debug(CNF_DEBUG, "Trying to load Rom from %s...\n", romPath.c_str());

diff --git a/Emulator/Components/Ports/AudioPort.cpp b/Emulator/Components/Ports/AudioPort.cpp
@@ -76,8 +76,6 @@ AudioPort::_dump(Category category, std::ostream& os) const
 void
 AudioPort::_initialize()
 {
-    CoreComponent::_initialize();
-
     setSampleRate(44100);
 }
 

diff --git a/Emulator/Misc/Recorder/Recorder.cpp b/Emulator/Misc/Recorder/Recorder.cpp
@@ -24,8 +24,6 @@ Recorder::Recorder(Amiga& ref) : SubComponent(ref)
 void
 Recorder::_initialize()
 {
-    CoreComponent::_initialize();
-
     FFmpeg::init();
 }
 

diff --git a/Emulator/Misc/RetroShell/Console.cpp b/Emulator/Misc/RetroShell/Console.cpp
@@ -20,8 +20,6 @@ namespace vamiga {
 void
 Console::_initialize()
 {
-    CoreComponent::_initialize();
-
     // Register commands
     initCommands(root);
 

diff --git a/Emulator/Peripherals/Drive/FloppyDrive.cpp b/Emulator/Peripherals/Drive/FloppyDrive.cpp
@@ -61,8 +61,6 @@ FloppyDrive::operator= (const FloppyDrive& other) {
 void
 FloppyDrive::_initialize()
 {
-    CoreComponent::_initialize();
-
     string path;
 
     if (objid == 0) path = INITIAL_DF0;

diff --git a/Emulator/Peripherals/Drive/HardDrive.cpp b/Emulator/Peripherals/Drive/HardDrive.cpp
@@ -220,8 +220,6 @@ HardDrive::init(const std::filesystem::path &path) throws
 void
 HardDrive::_initialize()
 {
-    CoreComponent::_initialize();
-
     string path;
 
     if (objid == 0) path = INITIAL_HD0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,8 +21,6 @@ Sequencer::Sequencer(Amiga& ref) : SubComponent(ref) @@
     void
     Sequencer::_initialize()
     {
-        CoreComponent::_initialize();
         initDasEventTable();
     }
@@ Expand Down @@