mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-20 01:21:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

(BB10) Get rid of 'emulator' references in BB10 frontend

Browse Source
This commit is contained in:
twinaphex 2014-05-17 15:51:55 +02:00
parent a0567c3c77
commit ff4a0913be
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blackberry-qnx/bb10/src/ButtonMap.h
View File

@ -31,7 +31,7 @@ public:
QString getLabel(int button);
//pass in RARCH button enum for button, map to g_setting
int mapNextButtonPressed();
//Call in our emulator thread with seperate screen_cxt
//Call in our RetroArch thread with seperate screen_cxt
int getButtonMapping(int player, int button);
//Call from frontend
int requestButtonMapping(screen_device_t device, int player, int button);

6
blackberry-qnx/bb10/src/RetroArch-Cascades.cpp
View File

@ -154,7 +154,7 @@ void RetroArch::run()
RARCH_ERR("Screen join window group failed.\n");
}
char *win_id = "RetroArch_Emulator_Window";
char *win_id = "RetroArch_Window";
screen_set_window_property_cv(screen_win, SCREEN_PROPERTY_ID_STRING, strlen(win_id), win_id);
int z = 10;
@ -221,7 +221,7 @@ void RetroArch::onRotationCompleted()
if (OrientationSupport::instance()->orientation() == UIOrientation::Landscape)
{
if (state == RETROARCH_START_REQUESTED)
startEmulator();
start();
}
}
@ -244,7 +244,7 @@ void RetroArch::onCoreSelected(QVariant value)
/*
* Functions
*/
void RetroArch::startEmulator()
void RetroArch::start()
{
state = RETROARCH_START_REQUESTED;

2
blackberry-qnx/bb10/src/RetroArch-Cascades.h
View File

@ -33,7 +33,7 @@ public:
RetroArch();
~ RetroArch();
Q_INVOKABLE void startEmulator();
Q_INVOKABLE void start();
Q_INVOKABLE void findDevices();
Q_INVOKABLE void discoverController(int player);
void populateCores(core_info_list_t * info);