Mirrors/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra synced 2024-11-15 13:18:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bootmanager: changed filename to std::string

Browse source
This commit is contained in:
archshift 2014-08-14 23:59:31 -07:00
parent 73c53b5eb8
commit 6096b289b7
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 "citra/citra.h"
#include "citra/emu_window/emu_window_glfw.h"
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 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()

4
src/citra_qt/bootmanager.hxx
View file

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

5
src/citra_qt/main.cpp
View file

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

2
src/citra_qt/main.hxx
View file

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