From 445db97d31425feb2672c85980d077ca94e771a1 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Wed, 31 Mar 2021 02:21:50 -0500
Subject: [PATCH] [nostalgia/core] Add input.hpp to core.hpp

---
 src/nostalgia/core/core.hpp   | 1 +
 src/nostalgia/player/app.cpp  | 1 -
 src/nostalgia/player/main.cpp | 4 +---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/nostalgia/core/core.hpp b/src/nostalgia/core/core.hpp
index 7525a369..db129fe3 100644
--- a/src/nostalgia/core/core.hpp
+++ b/src/nostalgia/core/core.hpp
@@ -12,6 +12,7 @@
 
 #include "consts.hpp"
 #include "gfx.hpp"
+#include "input.hpp"
 #include "media.hpp"
 
 namespace nostalgia::core {
diff --git a/src/nostalgia/player/app.cpp b/src/nostalgia/player/app.cpp
index d0d57c3c..383adafa 100644
--- a/src/nostalgia/player/app.cpp
+++ b/src/nostalgia/player/app.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <nostalgia/core/core.hpp>
-#include <nostalgia/core/input.hpp>
 
 using namespace nostalgia;
 
diff --git a/src/nostalgia/player/main.cpp b/src/nostalgia/player/main.cpp
index d0fdb32c..9cc92ea2 100644
--- a/src/nostalgia/player/main.cpp
+++ b/src/nostalgia/player/main.cpp
@@ -11,13 +11,11 @@
 
 #include "app.hpp"
 
-using namespace nostalgia;
-
 int main(int argc, const char **argv) {
 	if (argc > 1) {
 		ox::trace::init();
 		auto path = argv[1];
-		auto fs = core::loadRomFs(path);
+		auto fs = nostalgia::core::loadRomFs(path);
 		auto err = run(fs);
 		oxAssert(err, "Something went wrong...");
 		delete fs;