fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renaming xe::fs to xe::filesystem and xe::kernel::fs to xe::vfs.

Browse Source 
Progress on #294.
This commit is contained in:
Ben Vanik
2015-06-27 13:31:21 -07:00
parent bc75b0ab87
commit 0716cf84c0
45 changed files with 374 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/xenia/emulator.cc
View File

@@ -21,9 +21,9 @@
#include "xenia/kernel/kernel.h"
#include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/modules.h"
#include "xenia/kernel/fs/filesystem.h"
#include "xenia/memory.h"
#include "xenia/ui/main_window.h"
#include "xenia/vfs/virtual_file_system.h"
DEFINE_double(time_scalar, 1.0,
"Scalar used to speed or slow time (1x, 2x, 1/2x, etc).");
@@ -34,8 +34,8 @@ using namespace xe::apu;
using namespace xe::cpu;
using namespace xe::gpu;
using namespace xe::hid;
using namespace xe::kernel::fs;
using namespace xe::ui;
using namespace xe::vfs;
Emulator::Emulator(const std::wstring& command_line)
: command_line_(command_line) {}
@@ -139,7 +139,7 @@ X_STATUS Emulator::Setup() {
}
// Bring up the virtual filesystem used by the kernel.
file_system_ = std::make_unique<FileSystem>();
file_system_ = std::make_unique<VirtualFileSystem>();
// Shared kernel state.
kernel_state_ = std::make_unique<kernel::KernelState>(this);