dfsound: readded windows support.

gtk gui: increased number of savestate slots.

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@56022 e17a0e51-4ae3-4d35-97c3-1a29b211df97

3 files changed, 52 insertions, 4 deletions

diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index 89da504f..9e8f472f 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -62,10 +62,10 @@ GtkWidget *Window = NULL;
 
 int destroy = 0;
 
-#define MAX_SLOTS 5
+#define MAX_SLOTS 9
 
 /* TODO - If MAX_SLOTS changes, need to find a way to automatically set all positions */
-int Slots[MAX_SLOTS] = { -1, -1, -1, -1, -1 };
+int Slots[MAX_SLOTS] = { -1, -1, -1, -1, -1, -1, -1, -1, -1 };
 
 void ResetMenuSlots(GladeXML *xml) {
 	GtkWidget *widget;
@@ -267,6 +267,18 @@ void StartGui() {
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot5");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 4, NULL, G_CONNECT_AFTER);	
+	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot6");
+	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 5, NULL, G_CONNECT_AFTER);	
+	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot7");
+	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 6, NULL, G_CONNECT_AFTER);	
+	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot8");
+	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 7, NULL, G_CONNECT_AFTER);	
+	widget = glade_xml_get_widget(xml, "GtkMenuItem_LoadSlot9");
+	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+			GTK_SIGNAL_FUNC(on_states_load), (gpointer) 8, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "other1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			GTK_SIGNAL_FUNC(on_states_load_other), NULL, NULL, G_CONNECT_AFTER);			
@@ -286,6 +298,18 @@ void StartGui() {
 	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot5");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 4, NULL, G_CONNECT_AFTER);	
+	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot6");
+	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 5, NULL, G_CONNECT_AFTER);	
+	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot7");
+	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 6, NULL, G_CONNECT_AFTER);	
+	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot8");
+	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 7, NULL, G_CONNECT_AFTER);	
+	widget = glade_xml_get_widget(xml, "GtkMenuItem_SaveSlot9");
+	g_signal_connect_data(GTK_OBJECT(widget), "activate",
+			GTK_SIGNAL_FUNC(on_states_save), (gpointer) 8, NULL, G_CONNECT_AFTER);	
 	widget = glade_xml_get_widget(xml, "other2");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			GTK_SIGNAL_FUNC(on_states_save_other), NULL, NULL, G_CONNECT_AFTER);
diff --git a/gui/LnxMain.c b/gui/LnxMain.c
index 8297a917..1de6e25d 100644
--- a/gui/LnxMain.c
+++ b/gui/LnxMain.c
@@ -329,7 +329,7 @@ int main(int argc, char *argv[]) {
 							"\t-nogui\t\tDon't open the GTK GUI\n"
 							"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
 							"\t-psxout\t\tEnable PSX output\n"
-							"\t-load STATENUM\tLoads savestate STATENUM (1-5)\n"
+							"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
 							"\t-h -help\tDisplay this message\n"
 							"\tfile\t\tLoads file\n"));
 			 return 0;
diff --git a/gui/Plugin.c b/gui/Plugin.c
index 867fce03..f31fef02 100644
--- a/gui/Plugin.c
+++ b/gui/Plugin.c
@@ -31,7 +31,7 @@
 
 #include "nopic.h"
 
-#define MAX_SLOTS 5	/* ADB TODO Same as Gtk2Gui.c */
+#define MAX_SLOTS 9	/* ADB TODO Same as Gtk2Gui.c */
 
 void OnFile_Exit();
 
@@ -173,6 +173,30 @@ void PADhandleKey(int key) {
 			if (modalt) KeyStateLoad(4);
 			if (modctrl) KeyStateSave(4);
 			break;
+		case XK_6:
+			if (modalt && modctrl)
+				return;
+			if (modalt) KeyStateLoad(5);
+			if (modctrl) KeyStateSave(5);
+			break;
+		case XK_7:
+			if (modalt && modctrl)
+				return;
+			if (modalt) KeyStateLoad(6);
+			if (modctrl) KeyStateSave(6);
+			break;
+		case XK_8:
+			if (modalt && modctrl)
+				return;
+			if (modalt) KeyStateLoad(7);
+			if (modctrl) KeyStateSave(7);
+			break;
+		case XK_9:
+			if (modalt && modctrl)
+				return;
+			if (modalt) KeyStateLoad(8);
+			if (modctrl) KeyStateSave(8);
+			break;
 
 		case XK_F1:
 			GPU_freeze(2, (GPUFreeze_t *)&StatesC);