Emulation/pcsxr
1
0
Fork 0
mirror of https://github.com/iCatButler/pcsxr.git synced 2024-06-02 19:27:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

* Plugin.c: Add PGXP visual debug binding (F11)

Browse source 
* GtkGui.c: Fix path saving in file selection dialog
* LnxMain.c: Don't look for bios in data directory
This commit is contained in:
Stelios Tsampas 2017-07-28 13:13:09 +03:00
parent db51fade6d
commit b117a70fd0
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gui/GtkGui.c
View file

@ -34,6 +34,7 @@
#include "../libpcsxcore/plugins.h"
#include "../libpcsxcore/cheat.h"
#include "../libpcsxcore/cdrom.h"
#include "MemcardDlg.h"
#include "ConfDlg.h"
@ -775,11 +776,9 @@ static gchar *Open_Iso_Proc() {
strncpy(current_folder, filename, strrchr(filename, '/') - filename);
}
/* If ISO path is NULL save current path. */
if (!S_ISDIR(sb.st_mode)) {
/* Save current path. */
strcpy(Config.IsoImgDir, current_folder);
SaveConfig();
}
/* free useless data */
GSList * ll = l;

2
gui/LnxMain.c
View file

@ -232,9 +232,7 @@ static void ScanAllPlugins (void) {
ScanBios("/usr/local/share/psemu/bios");
ScanBios("/usr/local/share/pcsxr");
ScanBios("/usr/local/share/pcsxr/bios");
ScanBios(PACKAGE_DATA_DIR);
ScanBios(PSEMU_DATA_DIR);
ScanBios(PACKAGE_DATA_DIR "/bios");
ScanBios(PSEMU_DATA_DIR "/bios");
currentdir = g_strconcat(getenv("HOME"), "/.psemu-plugins/", NULL);

5
gui/Plugin.c
View file

@ -30,6 +30,7 @@
#include "../libpcsxcore/plugins.h"
#include "../libpcsxcore/spu.h"
#include "../libpcsxcore/cdriso.h"
#include "../libpcsxcore/pgxp_mem.h"
#include "nopic.h"
@ -241,6 +242,9 @@ void PADhandleKey(int key) {
LidInterrupt();
break;
case XK_F11:
GPU_toggleDebug();
break;
case XK_F12:
psxReset();
break;
@ -329,6 +333,7 @@ int _OpenPlugins() {
SPU_registerCallback(SPUirq);
ret = GPU_open(&gpuDisp, "PCSXR", NULL);
if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; }
GPU_pgxpMemory(0, PGXP_GetMem());
ret = PAD1_open(&gpuDisp);
ret |= PAD1_init(1); // Allow setting to change during run
if (ret < 0) { SysMessage(_("Error opening Controller 1 plugin!")); return -1; }

8
plugins/dfinput/pad.c
View file

@ -125,9 +125,7 @@ long PADopen(unsigned long *Disp) {
}
#if SDL_VERSION_ATLEAST(2,0,0)
SDL_QuitSubSystem(SDL_INIT_JOYSTICK);
if (SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER) == -1)
return PSE_PAD_ERR_FAILURE;
SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER);
has_haptic = 0;
if (SDL_InitSubSystem(SDL_INIT_HAPTIC) == 0)
@ -497,7 +495,7 @@ unsigned char PADpoll(unsigned char value) {
if (buf == NULL) {
return 0;
}
switch (CurCmd) {
case CMD_READ_DATA_AND_VIBRATE:
if (g.cfg.PadDef[CurPad].Type == PSE_PAD_TYPE_ANALOGPAD) {
@ -516,7 +514,7 @@ unsigned char PADpoll(unsigned char value) {
if (!JoyHapticRumble(CurPad, g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1])) {
//gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);
}
if(gpuVisualVibration != NULL &&
g.cfg.PadDef[CurPad].VisualVibration) {
gpuVisualVibration(g.PadState[CurPad].VibF[0], g.PadState[CurPad].VibF[1]);