From 9c45e9c7df1efa5bc1c8e73b6eaef4726b828d3e Mon Sep 17 00:00:00 2001 From: Hannes Schulze Date: Tue, 4 Feb 2025 19:59:47 +0100 Subject: add span type --- lib/nes/app/application.cc | 6 +++--- lib/nes/app/file-browser.hh | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/nes/app') diff --git a/lib/nes/app/application.cc b/lib/nes/app/application.cc index 5471984..b528e61 100644 --- a/lib/nes/app/application.cc +++ b/lib/nes/app/application.cc @@ -92,10 +92,10 @@ namespace nes::app } case action::type::launch_game: { - nes::u8 buffer[sys::cartridge::max_file_size]; - auto const length = file_browser_.load(a.get_file_name(), buffer, sizeof(buffer)); + u8 buffer[sys::cartridge::max_file_size]; + auto const length = file_browser_.load(a.get_file_name(), buffer); - console_.emplace(display_, buffer, length); + console_.emplace(display_, span{ buffer, length }); if (console_->get_status() != sys::status::success) { std::cerr << "Unable to load cartridge: " << to_string(console_->get_status()) << std::endl; diff --git a/lib/nes/app/file-browser.hh b/lib/nes/app/file-browser.hh index 67be794..6ce55aa 100644 --- a/lib/nes/app/file-browser.hh +++ b/lib/nes/app/file-browser.hh @@ -1,6 +1,7 @@ #pragma once #include "nes/common/types.hh" +#include "nes/common/span.hh" namespace nes { @@ -50,7 +51,7 @@ namespace nes::app virtual auto read_next(item* out_item) -> bool = 0; virtual auto navigate_up() -> void = 0; virtual auto navigate(std::string_view) -> void = 0; - virtual auto load(std::string_view, u8* buffer, u32 buffer_size) -> u32 = 0; + virtual auto load(std::string_view, span) -> u32 = 0; protected: explicit file_browser() = default; -- cgit v1.3.1