summaryrefslogtreecommitdiff
path: root/src/core/loader/nca.h
diff options
context:
space:
mode:
authorZach Hilman <DarkLordZach@users.noreply.github.com>2018-07-06 10:51:32 -0400
committerbunnei <bunneidev@gmail.com>2018-07-06 10:51:32 -0400
commit77c684c1140f6bf3fb7d4560d06d2efb1a2ee5e2 (patch)
tree38ef6451732c5eecb0efdd198f3db4d33848453c /src/core/loader/nca.h
parent51bd76a5fda00b0ad9c6791193a15d83dfbadac3 (diff)
Virtual Filesystem (#597)
* Add VfsFile and VfsDirectory classes * Finish abstract Vfs classes * Implement RealVfsFile (computer fs backend) * Finish RealVfsFile and RealVfsDirectory * Finished OffsetVfsFile * More changes * Fix import paths * Major refactor * Remove double const * Use experimental/filesystem or filesystem depending on compiler * Port partition_filesystem * More changes * More Overhaul * FSP_SRV fixes * Fixes and testing * Try to get filesystem to compile * Filesystem on linux * Remove std::filesystem and document/test * Compile fixes * Missing include * Bug fixes * Fixes * Rename v_file and v_dir * clang-format fix * Rename NGLOG_* to LOG_* * Most review changes * Fix TODO * Guess 'main' to be Directory by filename
Diffstat (limited to 'src/core/loader/nca.h')
-rw-r--r--src/core/loader/nca.h19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/core/loader/nca.h b/src/core/loader/nca.h
index 3b6c451d0..a5639f149 100644
--- a/src/core/loader/nca.h
+++ b/src/core/loader/nca.h
@@ -6,44 +6,37 @@
#include <string>
#include "common/common_types.h"
-#include "core/file_sys/partition_filesystem.h"
+#include "core/file_sys/content_archive.h"
#include "core/file_sys/program_metadata.h"
#include "core/hle/kernel/kernel.h"
#include "core/loader/loader.h"
namespace Loader {
-class Nca;
-
/// Loads an NCA file
class AppLoader_NCA final : public AppLoader {
public:
- AppLoader_NCA(FileUtil::IOFile&& file, std::string filepath);
+ explicit AppLoader_NCA(FileSys::VirtualFile file);
/**
* Returns the type of the file
- * @param file FileUtil::IOFile open file
- * @param filepath Path of the file that we are opening.
+ * @param file std::shared_ptr<VfsFile> open file
* @return FileType found, or FileType::Error if this loader doesn't know it
*/
- static FileType IdentifyType(FileUtil::IOFile& file, const std::string& filepath);
+ static FileType IdentifyType(const FileSys::VirtualFile& file);
FileType GetFileType() override {
- return IdentifyType(file, filepath);
+ return IdentifyType(file);
}
ResultStatus Load(Kernel::SharedPtr<Kernel::Process>& process) override;
- ResultStatus ReadRomFS(std::shared_ptr<FileUtil::IOFile>& romfs_file, u64& offset,
- u64& size) override;
-
~AppLoader_NCA();
private:
- std::string filepath;
FileSys::ProgramMetadata metadata;
- std::unique_ptr<Nca> nca;
+ std::unique_ptr<FileSys::NCA> nca;
};
} // namespace Loader