OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-23 03:00:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47 from archshift/stdstring

Browse Source 
Bootmanager: changed `filename` to std::string
This commit is contained in:
bunnei 2014-08-15 09:53:57 -04:00
commit d1c2b76ad1
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/citra/emu_window/emu_window_glfw.cpp
View File

@ -6,7 +6,6 @@
#include "video_core/video_core.h" #include "video_core/video_core.h"
#include "citra/citra.h"
#include "citra/emu_window/emu_window_glfw.h" #include "citra/emu_window/emu_window_glfw.h"
static void OnKeyEvent(GLFWwindow* win, int key, int action) { static void OnKeyEvent(GLFWwindow* win, int key, int action) {

8
src/citra_qt/bootmanager.cpp
View File

@ -17,13 +17,15 @@
#define APP_TITLE APP_NAME " " APP_VERSION #define APP_TITLE APP_NAME " " APP_VERSION
#define COPYRIGHT "Copyright (C) 2013-2014 Citra Team" #define COPYRIGHT "Copyright (C) 2013-2014 Citra Team"
EmuThread::EmuThread(GRenderWindow* render_window) : exec_cpu_step(false), cpu_running(false), render_window(render_window) EmuThread::EmuThread(GRenderWindow* render_window) :
exec_cpu_step(false), cpu_running(false),
render_window(render_window), filename("")
{ {
} }
void EmuThread::SetFilename(const char* filename) void EmuThread::SetFilename(std::string filename)
{ {
strcpy(this->filename, filename); this->filename = filename;
} }
void EmuThread::run() void EmuThread::run()

4
src/citra_qt/bootmanager.hxx
View File

@ -17,7 +17,7 @@ public:
* @param filename * @param filename
* @warning Only call when not running! * @warning Only call when not running!
*/ */
void SetFilename(const char* filename); void SetFilename(std::string filename);
/** /**
* Start emulation (on new thread) * Start emulation (on new thread)
@ -62,7 +62,7 @@ private:
EmuThread(GRenderWindow* render_window); EmuThread(GRenderWindow* render_window);
char filename[MAX_PATH]; std::string filename;
bool exec_cpu_step; bool exec_cpu_step;
bool cpu_running; bool cpu_running;

5
src/citra_qt/main.cpp
View File

@ -123,7 +123,7 @@ GMainWindow::~GMainWindow()
delete render_window; delete render_window;
} }
void GMainWindow::BootGame(const char* filename) void GMainWindow::BootGame(std::string filename)
{ {
NOTICE_LOG(MASTER_LOG, "citra starting...\n"); NOTICE_LOG(MASTER_LOG, "citra starting...\n");
@ -134,8 +134,7 @@ void GMainWindow::BootGame(const char* filename)
} }
// Load a game or die... // Load a game or die...
std::string boot_filename = filename; if (Loader::ResultStatus::Success != Loader::LoadFile(filename)) {
if (Loader::ResultStatus::Success != Loader::LoadFile(boot_filename)) {
ERROR_LOG(BOOT, "Failed to load ROM!"); ERROR_LOG(BOOT, "Failed to load ROM!");
} }

2
src/citra_qt/main.hxx
View File

@ -30,7 +30,7 @@ public:
~GMainWindow(); ~GMainWindow();
private: private:
void BootGame(const char* filename); void BootGame(std::string filename);
void closeEvent(QCloseEvent* event); void closeEvent(QCloseEvent* event);