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

unique_ptr'ing things and removing some XECLEANUP.

Browse Source
This commit is contained in:
Ben Vanik
2014-08-20 23:26:46 -07:00
parent 244e8a8745
commit c59d053404
43 changed files with 271 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/xenia/emulator.h
View File

@@ -54,20 +54,22 @@ class Emulator {
ui::Window* main_window() const { return main_window_; }
void set_main_window(ui::Window* window);
Memory* memory() const { return memory_; }
Memory* memory() const { return memory_.get(); }
DebugAgent* debug_agent() const { return debug_agent_.get(); }
cpu::Processor* processor() const { return processor_; }
apu::AudioSystem* audio_system() const { return audio_system_; }
gpu::GraphicsSystem* graphics_system() const { return graphics_system_; }
hid::InputSystem* input_system() const { return input_system_; }
cpu::Processor* processor() const { return processor_.get(); }
apu::AudioSystem* audio_system() const { return audio_system_.get(); }
gpu::GraphicsSystem* graphics_system() const {
return graphics_system_.get();
}
hid::InputSystem* input_system() const { return input_system_.get(); }
ExportResolver* export_resolver() const { return export_resolver_; }
kernel::fs::FileSystem* file_system() const { return file_system_; }
ExportResolver* export_resolver() const { return export_resolver_.get(); }
kernel::fs::FileSystem* file_system() const { return file_system_.get(); }
kernel::XboxkrnlModule* xboxkrnl() const { return xboxkrnl_; }
kernel::XamModule* xam() const { return xam_; }
kernel::XboxkrnlModule* xboxkrnl() const { return xboxkrnl_.get(); }
kernel::XamModule* xam() const { return xam_.get(); }
X_STATUS Setup();
@@ -82,23 +84,24 @@ class Emulator {
std::wstring command_line_;
// TODO(benvanik): remove from here?
ui::Window* main_window_;
Memory* memory_;
std::unique_ptr<Memory> memory_;
std::unique_ptr<DebugAgent> debug_agent_;
cpu::Processor* processor_;
apu::AudioSystem* audio_system_;
gpu::GraphicsSystem* graphics_system_;
hid::InputSystem* input_system_;
std::unique_ptr<cpu::Processor> processor_;
std::unique_ptr<apu::AudioSystem> audio_system_;
std::unique_ptr<gpu::GraphicsSystem> graphics_system_;
std::unique_ptr<hid::InputSystem> input_system_;
ExportResolver* export_resolver_;
kernel::fs::FileSystem* file_system_;
std::unique_ptr<ExportResolver> export_resolver_;
std::unique_ptr<kernel::fs::FileSystem> file_system_;
kernel::KernelState* kernel_state_;
kernel::XamModule* xam_;
kernel::XboxkrnlModule* xboxkrnl_;
std::unique_ptr<kernel::KernelState> kernel_state_;
std::unique_ptr<kernel::XamModule> xam_;
std::unique_ptr<kernel::XboxkrnlModule> xboxkrnl_;
};
} // namespace xe