xavi/pcsxr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gtk: enable controller configuration change during emulation pause/stop.

Browse Source 
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@90350 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\ckain_cp 2014-05-12 07:21:29 +00:00
parent 0d9ec383e2
commit 5df78f4c2b
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/ConfDlg.c
View File

@ -326,6 +326,7 @@ void OnConf_Pad() {
PADconfigure conf;
char Plugin[MAXPATHLEN];
// PAD 1
sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad1);
drv = SysLoadLibrary(Plugin);
if (drv == NULL) { printf("Error with file %s\n", Plugin); return; }
@ -341,6 +342,7 @@ void OnConf_Pad() {
SysCloseLibrary(drv);
// PAD 2
if (strcmp(Config.Pad1, Config.Pad2) != 0) {
sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad2);
drv = SysLoadLibrary(Plugin);

8
gui/GtkGui.c
View File

@ -129,8 +129,6 @@ void ResetMenuSlots() {
gtk_widget_set_sensitive(widget, TRUE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "cdrom1"));
gtk_widget_set_sensitive(widget, TRUE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "pad1"));
gtk_widget_set_sensitive(widget, TRUE);
#ifdef ENABLE_SIO1API
widget = GTK_WIDGET(gtk_builder_get_object(builder, "sio1"));
gtk_widget_set_sensitive(widget, TRUE);
@ -149,8 +147,6 @@ void ResetMenuSlots() {
gtk_widget_set_sensitive(widget, TRUE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_cdrom"));
gtk_widget_set_sensitive(widget, TRUE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_controllers"));
gtk_widget_set_sensitive(widget, TRUE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "statusbar"));
gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);
@ -179,8 +175,6 @@ void ResetMenuSlots() {
gtk_widget_set_sensitive(widget, FALSE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "cdrom1"));
gtk_widget_set_sensitive(widget, FALSE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "pad1"));
gtk_widget_set_sensitive(widget, FALSE);
#ifdef ENABLE_SIO1API
widget = GTK_WIDGET(gtk_builder_get_object(builder, "sio1"));
gtk_widget_set_sensitive(widget, FALSE);
@ -197,8 +191,6 @@ void ResetMenuSlots() {
gtk_widget_set_sensitive(widget, FALSE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_cdrom"));
gtk_widget_set_sensitive(widget, FALSE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "toolbutton_controllers"));
gtk_widget_set_sensitive(widget, FALSE);
widget = GTK_WIDGET(gtk_builder_get_object(builder, "statusbar"));
gtk_statusbar_pop(GTK_STATUSBAR(widget), 1);

2
gui/Plugin.c
View File

@ -350,10 +350,12 @@ int _OpenPlugins() {
ret = GPU_open(&gpuDisp, "PCSXR", NULL);
if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; }
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; }
PAD1_registerVibration(GPU_visualVibration);
PAD1_registerCursor(GPU_cursor);
ret = PAD2_open(&gpuDisp);
ret |= PAD2_init(2); // Allow setting to change during run
if (ret < 0) { SysMessage(_("Error opening Controller 2 plugin!")); return -1; }
PAD2_registerVibration(GPU_visualVibration);
PAD2_registerCursor(GPU_cursor);