diff --git a/src/common/PNGLibrary.cxx b/src/common/PNGLibrary.cxx index 6aa4c143a..c3ae97b0d 100644 --- a/src/common/PNGLibrary.cxx +++ b/src/common/PNGLibrary.cxx @@ -23,7 +23,6 @@ #include "bspf.hxx" #include "FrameBuffer.hxx" #include "Props.hxx" -#include "TIA.hxx" #include "PNGLibrary.hxx" // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/common/PNGLibrary.hxx b/src/common/PNGLibrary.hxx index 9b2cc4eec..babcfc704 100644 --- a/src/common/PNGLibrary.hxx +++ b/src/common/PNGLibrary.hxx @@ -25,7 +25,6 @@ class FrameBuffer; class FBSurface; class Properties; -class TIA; #include #include "bspf.hxx" diff --git a/src/emucore/Console.cxx b/src/emucore/Console.cxx index 1dcf8d0aa..10fa064d7 100644 --- a/src/emucore/Console.cxx +++ b/src/emucore/Console.cxx @@ -83,7 +83,7 @@ Console::Console(OSystem& osystem, unique_ptr& cart, // Create subsystems for the console my6502 = make_ptr(myOSystem.settings()); myRiot = make_ptr(*this, myOSystem.settings()); - myTIA = make_ptr(*this, myOSystem.sound(), myOSystem.settings()); + myTIA = make_ptr(*this, myOSystem.sound(), myOSystem.settings()); mySwitches = make_ptr(myEvent, myProperties); // Construct the system and components diff --git a/src/emucore/tia/core_default/TIA.cxx b/src/emucore/tia/core_default/TIA.cxx index de8fc52a9..0f2eb5031 100644 --- a/src/emucore/tia/core_default/TIA.cxx +++ b/src/emucore/tia/core_default/TIA.cxx @@ -37,6 +37,8 @@ #define HBLANK 68 #define CLAMP_POS(reg) if(reg < 0) { reg += 160; } reg %= 160; +namespace TIADefaultCore { + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - TIA::TIA(Console& console, Sound& sound, Settings& settings) : myConsole(console), @@ -2489,3 +2491,5 @@ inline void TIA::applyPreviousHMOVEMotion(int hpos, Int16& pos, uInt8 motion) } } } + +} // namespace TIADefaultCore \ No newline at end of file diff --git a/src/emucore/tia/core_default/TIA.hxx b/src/emucore/tia/core_default/TIA.hxx index 7a8b97ac4..34b4f96f1 100644 --- a/src/emucore/tia/core_default/TIA.hxx +++ b/src/emucore/tia/core_default/TIA.hxx @@ -29,6 +29,8 @@ class Sound; #include "System.hxx" #include "TIATables.hxx" +namespace TIADefaultCore { + /** This class is a device that emulates the Television Interface Adaptor found in the Atari 2600 and 7800 consoles. The Television Interface @@ -648,4 +650,6 @@ class TIA : public AbstractTIA TIA& operator=(TIA&&) = delete; }; +} // namespace TIADefaultCore + #endif diff --git a/src/emucore/tia/core_default/TIATables.cxx b/src/emucore/tia/core_default/TIATables.cxx index 94159d216..efb1a32c0 100644 --- a/src/emucore/tia/core_default/TIATables.cxx +++ b/src/emucore/tia/core_default/TIATables.cxx @@ -22,6 +22,8 @@ #include "bspf.hxx" #include "TIATables.hxx" +namespace TIADefaultCore { + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void TIATables::computeAllTables() { @@ -724,3 +726,5 @@ uInt8 TIATables::DisabledMask[640]; // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Int8 TIATables::PxPosResetWhen[8][160][160]; + +} // namespace TIADefaultCore \ No newline at end of file diff --git a/src/emucore/tia/core_default/TIATables.hxx b/src/emucore/tia/core_default/TIATables.hxx index c4bd6f31f..506f4d139 100644 --- a/src/emucore/tia/core_default/TIATables.hxx +++ b/src/emucore/tia/core_default/TIATables.hxx @@ -31,6 +31,9 @@ @author Stephen Anthony @version $Id$ */ + +namespace TIADefaultCore { + class TIATables { public: @@ -114,4 +117,6 @@ class TIATables TIATables& operator=(TIATables&&) = delete; }; +} // namespace TIADefaultCore + #endif \ No newline at end of file