GTK: added newPPU option
GTK: fixed issue where some options were not being saved when a game wasn't being loaded SDL: fixed an issue with newPPU command-line option
This commit is contained in:
parent
2e5093fe6e
commit
3376049269
|
@ -215,7 +215,7 @@ InitConfig()
|
||||||
config->addOption("ripsubs", "SDL.RipSubs", "");
|
config->addOption("ripsubs", "SDL.RipSubs", "");
|
||||||
|
|
||||||
// enable new PPU core
|
// enable new PPU core
|
||||||
config->addOption("newppu", "SDL.NewPPU", "0");
|
config->addOption("newppu", "SDL.NewPPU", 0);
|
||||||
|
|
||||||
// GamePad 0 - 3
|
// GamePad 0 - 3
|
||||||
for(unsigned int i = 0; i < GAMEPAD_NUM_DEVICES; i++) {
|
for(unsigned int i = 0; i < GAMEPAD_NUM_DEVICES; i++) {
|
||||||
|
|
|
@ -122,7 +122,7 @@ int setBufSize(GtkWidget* w, gpointer p)
|
||||||
// reset sound subsystem for changes to take effect
|
// reset sound subsystem for changes to take effect
|
||||||
KillSound();
|
KillSound();
|
||||||
InitSound();
|
InitSound();
|
||||||
|
g_config->save();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -133,7 +133,7 @@ void setRate(GtkWidget* w, gpointer p)
|
||||||
// reset sound subsystem for changes to take effect
|
// reset sound subsystem for changes to take effect
|
||||||
KillSound();
|
KillSound();
|
||||||
InitSound();
|
InitSound();
|
||||||
|
g_config->save();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,7 +147,7 @@ void setQuality(GtkWidget* w, gpointer p)
|
||||||
// reset sound subsystem for changes to take effect
|
// reset sound subsystem for changes to take effect
|
||||||
KillSound();
|
KillSound();
|
||||||
InitSound();
|
InitSound();
|
||||||
|
g_config->save();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,6 +155,7 @@ void setScaler(GtkWidget* w, gpointer p)
|
||||||
{
|
{
|
||||||
int x = gtk_combo_box_get_active(GTK_COMBO_BOX(w));
|
int x = gtk_combo_box_get_active(GTK_COMBO_BOX(w));
|
||||||
g_config->setOption("SDL.SpecialFilter", x);
|
g_config->setOption("SDL.SpecialFilter", x);
|
||||||
|
g_config->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
void setPal(GtkWidget* w, gpointer p)
|
void setPal(GtkWidget* w, gpointer p)
|
||||||
|
@ -169,15 +170,32 @@ void setPal(GtkWidget* w, gpointer p)
|
||||||
g_config->setOption("SDL.PAL", 0);
|
g_config->setOption("SDL.PAL", 0);
|
||||||
FCEUI_SetVidSystem(0);
|
FCEUI_SetVidSystem(0);
|
||||||
}
|
}
|
||||||
|
g_config->save();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setPpu(GtkWidget* w, gpointer p)
|
||||||
|
{
|
||||||
|
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
|
||||||
|
{
|
||||||
|
g_config->setOption("SDL.NewPPU", 1);
|
||||||
|
newppu = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
g_config->setOption("SDL.NewPPU", 0);
|
||||||
|
newppu = 0;
|
||||||
|
}
|
||||||
|
g_config->save();
|
||||||
|
}
|
||||||
|
|
||||||
void setGL(GtkWidget* w, gpointer p)
|
void setGL(GtkWidget* w, gpointer p)
|
||||||
{
|
{
|
||||||
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
|
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w)))
|
||||||
g_config->setOption("SDL.OpenGL", 1);
|
g_config->setOption("SDL.OpenGL", 1);
|
||||||
else
|
else
|
||||||
g_config->setOption("SDL.OpenGL", 0);
|
g_config->setOption("SDL.OpenGL", 0);
|
||||||
|
g_config->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
void openVideoConfig()
|
void openVideoConfig()
|
||||||
|
@ -190,6 +208,7 @@ void openVideoConfig()
|
||||||
GtkWidget* scalerCombo;
|
GtkWidget* scalerCombo;
|
||||||
GtkWidget* glChk;
|
GtkWidget* glChk;
|
||||||
GtkWidget* palChk;
|
GtkWidget* palChk;
|
||||||
|
GtkWidget* ppuChk;
|
||||||
|
|
||||||
win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
||||||
gtk_window_set_title(GTK_WINDOW(win), "Video Prefernces");
|
gtk_window_set_title(GTK_WINDOW(win), "Video Prefernces");
|
||||||
|
@ -240,11 +259,24 @@ void openVideoConfig()
|
||||||
else
|
else
|
||||||
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(palChk), 0);
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(palChk), 0);
|
||||||
|
|
||||||
|
// New PPU check
|
||||||
|
ppuChk = gtk_check_button_new_with_label("Enable new PPU");
|
||||||
|
g_signal_connect(GTK_OBJECT(ppuChk), "clicked", G_CALLBACK(setPpu), NULL);
|
||||||
|
|
||||||
|
// sync with config
|
||||||
|
buf = 0;
|
||||||
|
g_config->getOption("SDL.NewPPU", &buf);
|
||||||
|
if(buf)
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ppuChk), 1);
|
||||||
|
else
|
||||||
|
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(ppuChk), 0);
|
||||||
|
|
||||||
|
|
||||||
gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 2);
|
gtk_box_pack_start(GTK_BOX(vbox), lbl, FALSE, FALSE, 2);
|
||||||
gtk_box_pack_start(GTK_BOX(vbox), hbox1, FALSE, FALSE, 2);
|
gtk_box_pack_start(GTK_BOX(vbox), hbox1, FALSE, FALSE, 2);
|
||||||
gtk_box_pack_start(GTK_BOX(vbox), glChk, FALSE, FALSE, 2);
|
gtk_box_pack_start(GTK_BOX(vbox), glChk, FALSE, FALSE, 2);
|
||||||
gtk_box_pack_start(GTK_BOX(vbox), palChk, FALSE, FALSE, 2);
|
gtk_box_pack_start(GTK_BOX(vbox), palChk, FALSE, FALSE, 2);
|
||||||
|
gtk_box_pack_start(GTK_BOX(vbox), ppuChk, FALSE, FALSE, 2);
|
||||||
|
|
||||||
|
|
||||||
gtk_container_add(GTK_CONTAINER(win), vbox);
|
gtk_container_add(GTK_CONTAINER(win), vbox);
|
||||||
|
|
|
@ -765,9 +765,12 @@ SDL_GL_LoadLibrary(0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
g_config->getOption("SDL.NewPPU", &fname);
|
{
|
||||||
if (fname == "1")
|
int id;
|
||||||
|
g_config->getOption("SDL.NewPPU", &id);
|
||||||
|
if (id)
|
||||||
newppu = 1;
|
newppu = 1;
|
||||||
|
}
|
||||||
/*g_config->setOption("SDL.LuaScript", "");
|
/*g_config->setOption("SDL.LuaScript", "");
|
||||||
if (fname != "")
|
if (fname != "")
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue