Fix compilation errors.

Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
sh95014 · Dec 15, 2023 · a2e888a · a2e888a
1 parent e189516
commit a2e888a
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 19 deletions.
diff --git a/source/frontends/common2/commonframe.h b/source/frontends/common2/commonframe.h
@@ -1,9 +1,11 @@
 #pragma once
 
 #include "linux/linuxframe.h"
+
 #include "Common.h"
 #include "Configuration/Config.h"
-#include "speed.h"
+
+#include "frontends/common2/speed.h"
 #include <vector>
 #include <string>
 

diff --git a/source/frontends/libretro/game.cpp b/source/frontends/libretro/game.cpp
@@ -6,6 +6,7 @@
 #include "frontends/libretro/rkeyboard.h"
 #include "frontends/common2/utils.h"
 #include "frontends/common2/ptreeregistry.h"
+#include "frontends/common2/programoptions.h"
 
 #include "Common.h"
 #include "CardManager.h"
@@ -51,7 +52,9 @@ namespace ra2
     myLoggerContext = std::make_shared<LoggerContext>(true);
     myRegistry = CreateRetroRegistry();
     myRegistryContext = std::make_shared<RegistryContext>(myRegistry);
-    myFrame = std::make_shared<ra2::RetroFrame>();
+
+    const common2::EmulatorOptions defaultOptions;
+    myFrame = std::make_shared<ra2::RetroFrame>(defaultOptions);
 
     refreshVariables();
 

diff --git a/source/frontends/libretro/retroframe.cpp b/source/frontends/libretro/retroframe.cpp
@@ -1,4 +1,5 @@
 #include "StdAfx.h"
+#include "frontends/common2/commonframe.h"
 #include "frontends/libretro/retroframe.h"
 #include "frontends/libretro/environment.h"
 
@@ -77,7 +78,8 @@ namespace
 namespace ra2
 {
 
-  RetroFrame::RetroFrame()
+  RetroFrame::RetroFrame(const common2::EmulatorOptions & options)
+  : common2::CommonFrame(options)
   {
   }
 

diff --git a/source/frontends/libretro/retroframe.h b/source/frontends/libretro/retroframe.h
@@ -12,7 +12,7 @@ namespace ra2
   class RetroFrame : public virtual common2::CommonFrame, public common2::GNUFrame
   {
   public:
-    RetroFrame();
+    RetroFrame(const common2::EmulatorOptions & options);
 
     void VideoPresentScreen() override;
     void FrameRefreshStatus(int drawflags) override;

diff --git a/source/frontends/ncurses/main.cpp b/source/frontends/ncurses/main.cpp
@@ -144,7 +144,7 @@ namespace
     const LoggerContext loggerContext(options.log);
     const RegistryContext registryContet(CreateFileRegistry(options));
     const std::shared_ptr<na2::EvDevPaddle> paddle = std::make_shared<na2::EvDevPaddle>(options.paddleDeviceName);
-    const std::shared_ptr<na2::NFrame> frame = std::make_shared<na2::NFrame>(paddle);
+    const std::shared_ptr<na2::NFrame> frame = std::make_shared<na2::NFrame>(options, paddle);
 
     const common2::CommonInitialisation init(frame, paddle, options);
 

diff --git a/source/frontends/ncurses/nframe.cpp b/source/frontends/ncurses/nframe.cpp
@@ -1,4 +1,5 @@
 #include "StdAfx.h"
+#include "frontends/common2/commonframe.h"
 #include "frontends/ncurses/nframe.h"
 #include "frontends/ncurses/colors.h"
 #include "frontends/ncurses/asciiart.h"
@@ -41,8 +42,9 @@ namespace na2
     std::shared_ptr<GraphicsColors> colors;
   };
 
-  NFrame::NFrame(const std::shared_ptr<EvDevPaddle> & paddle)
-    : myPaddle(paddle)
+  NFrame::NFrame(const common2::EmulatorOptions & options, const std::shared_ptr<EvDevPaddle> & paddle)
+    : common2::CommonFrame(options)
+    , myPaddle(paddle)
     , myRows(-1)
     , myColumns(-1)
   {
@@ -392,8 +394,3 @@ namespace na2
   }
 
 }
-
-void SingleStep(bool /* bReinit */)
-{
-
-}
diff --git a/source/frontends/ncurses/nframe.h b/source/frontends/ncurses/nframe.h
@@ -17,7 +17,7 @@ namespace na2
   class NFrame : public virtual common2::CommonFrame, public common2::GNUFrame
   {
   public:
-    NFrame(const std::shared_ptr<EvDevPaddle> & paddle);
+    NFrame(const common2::EmulatorOptions & options, const std::shared_ptr<EvDevPaddle> & paddle);
 
     WINDOW * GetWindow();
     WINDOW * GetStatus();

diff --git a/source/frontends/sdl/sdlframe.cpp b/source/frontends/sdl/sdlframe.cpp
@@ -10,11 +10,8 @@
 #include "Core.h"
 #include "Utilities.h"
 #include "SaveState.h"
-#include "Speaker.h"
 #include "SoundCore.h"
 #include "Interface.h"
-#include "NTSC.h"
-#include "CPU.h"
 #include "MouseInterface.h"
 #include "Debugger/Debug.h"
 

diff --git a/source/frontends/sdl/sdlframe.h b/source/frontends/sdl/sdlframe.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#include "Common.h"
-#include "Configuration/Config.h"
 #include "frontends/common2/commonframe.h"
 #include "frontends/common2/controllerquit.h"
-#include "frontends/common2/speed.h"
 #include "frontends/common2/programoptions.h"
 #include "linux/network/portfwds.h"
 #include <SDL.h>