get rid of nasty stdlib

7 files changed, 19 insertions, 18 deletions

diff --git a/app/mac/impl/display-spritekit.mm b/app/mac/impl/display-spritekit.mm
index a5809c3..b949f85 100644
--- a/app/mac/impl/display-spritekit.mm
+++ b/app/mac/impl/display-spritekit.mm
@@ -22,8 +22,8 @@ namespace nes::app::mac
 
 	auto display_spritekit::switch_buffers() -> void
 	{
-		std::swap(buffer_back_, buffer_front_);
-		std::swap(bytes_back_, bytes_front_);
+		swap(buffer_back_, buffer_front_);
+		swap(bytes_back_, bytes_front_);
 
 		auto texture = [SKTexture textureWithData:buffer_front_ size:CGSizeMake(width, height) flipped:YES];
 		[texture setFilteringMode:SKTextureFilteringNearest];
diff --git a/app/mac/impl/file-browser-posix.cc b/app/mac/impl/file-browser-posix.cc
index 500ce83..d17b97c 100644
--- a/app/mac/impl/file-browser-posix.cc
+++ b/app/mac/impl/file-browser-posix.cc
@@ -53,8 +53,8 @@ namespace nes::app::mac
 				return false;
 			}
 
-			auto const name = std::string_view{ ent->d_name };
-			if (name.length() > max_name_length) { continue; }
+			auto const name = string_view{ ent->d_name };
+			if (name.get_length() > max_name_length) { continue; }
 			if (name[0] == '.') { continue; }
 
 			auto type = entry_type{};
@@ -77,7 +77,7 @@ namespace nes::app::mac
 		return status::success;
 	}
 
-	auto file_browser_posix::navigate(std::string_view const item) -> status
+	auto file_browser_posix::navigate(string_view const item) -> status
 	{
 		auto new_path = path_;
 		if (auto const s = new_path.push(item); s != status::success) { return s; }
@@ -86,12 +86,12 @@ namespace nes::app::mac
 		return status::success;
 	}
 
-	auto file_browser_posix::load(std::string_view const item, span<u8> const buffer, u32* out_length) -> status
+	auto file_browser_posix::load(string_view const item, span<u8> const buffer, u32* out_length) -> status
 	{
 		auto file_path = path_;
 		if (auto const s = file_path.push(item); s != status::success) { return s; }
 
-		auto const file_path_str = std::string{ file_path.get_path() };
+		auto const file_path_str = std::string{ file_path.get_path().get_data(), file_path.get_path().get_length() };
 		auto const fd = open(file_path_str.c_str(), O_RDONLY);
 		if (fd == -1)
 		{
@@ -121,9 +121,9 @@ namespace nes::app::mac
 		return status::success;
 	}
 
-	auto file_browser_posix::reopen_directory(std::string_view const path) -> status
+	auto file_browser_posix::reopen_directory(string_view const path) -> status
 	{
-		auto const path_str = std::string{ path };
+		auto const path_str = std::string{ path.get_data(), path.get_length() };
 		auto const new_it = opendir(path_str.c_str());
 		if (!new_it)
 		{
diff --git a/app/mac/impl/file-browser-posix.hh b/app/mac/impl/file-browser-posix.hh
index b60ce2b..1179c96 100644
--- a/app/mac/impl/file-browser-posix.hh
+++ b/app/mac/impl/file-browser-posix.hh
@@ -21,10 +21,10 @@ namespace nes::app::mac
 		auto seek(u32) -> void override;
 		auto read_next(entry* out_entry) -> bool override;
 		auto navigate_up() -> status override;
-		auto navigate(std::string_view) -> status override;
-		auto load(std::string_view, span<u8>, u32* out_length) -> status override;
+		auto navigate(string_view) -> status override;
+		auto load(string_view, span<u8>, u32* out_length) -> status override;
 
 	private:
-		auto reopen_directory(std::string_view path) -> status;
+		auto reopen_directory(string_view path) -> status;
 	};
 } // namespace nes::app::mac
\ No newline at end of file
diff --git a/app/mac/impl/input-device-gc-gamepad.hh b/app/mac/impl/input-device-gc-gamepad.hh
index b4b4a4e..04085f3 100644
--- a/app/mac/impl/input-device-gc-gamepad.hh
+++ b/app/mac/impl/input-device-gc-gamepad.hh
@@ -16,7 +16,7 @@ namespace nes::app::mac
 
 		auto is_reliable() const -> bool override { return true; }
 		auto get_controller() const -> GCController* { return [profile_ controller]; }
-		auto get_name() const -> std::string_view override;
+		auto get_name() const -> string_view override;
 		auto get_index() const -> index override;
 		auto set_index(index) -> void override;
 		auto read_buttons() -> sys::button_mask override;
diff --git a/app/mac/impl/input-device-gc-gamepad.mm b/app/mac/impl/input-device-gc-gamepad.mm
index d2f84ec..5d19120 100644
--- a/app/mac/impl/input-device-gc-gamepad.mm
+++ b/app/mac/impl/input-device-gc-gamepad.mm
@@ -7,7 +7,7 @@ namespace nes::app::mac
 	{
 	}
 
-	auto input_device_gc_gamepad::get_name() const -> std::string_view
+	auto input_device_gc_gamepad::get_name() const -> string_view
 	{
 		return [[get_controller() vendorName] UTF8String];
 	}
diff --git a/app/mac/impl/input-device-serial-controller.hh b/app/mac/impl/input-device-serial-controller.hh
index 2022ed2..eb58907 100644
--- a/app/mac/impl/input-device-serial-controller.hh
+++ b/app/mac/impl/input-device-serial-controller.hh
@@ -17,7 +17,7 @@ namespace nes::app::mac
 		~input_device_serial_controller() override;
 
 		auto is_reliable() const -> bool override;
-		auto get_name() const -> std::string_view override { return path_; }
+		auto get_name() const -> string_view override { return path_; }
 		auto get_index() const -> index override { return index_; }
 		auto set_index(index const v) -> void override { index_ = v; }
 		auto read_buttons() -> sys::button_mask override;
diff --git a/app/mac/scene.mm b/app/mac/scene.mm
index 0ff5122..0cfc2ac 100644
--- a/app/mac/scene.mm
+++ b/app/mac/scene.mm
@@ -5,6 +5,7 @@
 #import "impl/input-device-gc-gamepad.hh"
 #import "impl/input-device-serial-controller.hh"
 #import "nes/app/application.hh"
+#import <vector>
 #import <memory>
 #import <optional>
 
@@ -90,9 +91,9 @@ namespace
 {
     auto const lastTimestamp = _lastTimestamp.value_or(currentTime);
     _lastTimestamp = currentTime;
-    auto deltaMicroseconds = static_cast<nes::u64>((currentTime - lastTimestamp) * 1000. * 1000.);
-	deltaMicroseconds = std::min(deltaMicroseconds, nes::u64{ 50000 });
-    _app->frame(std::chrono::microseconds{ deltaMicroseconds });
+    auto deltaMicroseconds = static_cast<nes::u32>((currentTime - lastTimestamp) * 1000. * 1000.);
+	deltaMicroseconds = nes::min(deltaMicroseconds, nes::u32{ 50000 });
+    _app->frame(deltaMicroseconds);
 }
 
 - (void)handleKeyboardConnected:(NSNotification*)notification