SlowBoot.

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

7 files changed, 66 insertions, 34 deletions

diff --git a/data/pcsx.glade2 b/data/pcsx.glade2
index 761dd895..9f29d7c3 100644
--- a/data/pcsx.glade2
+++ b/data/pcsx.glade2
@@ -1459,7 +1459,7 @@
                     <child>
                       <widget class="GtkTable" id="table3">
                         <property name="visible">True</property>
-                        <property name="n_rows">4</property>
+                        <property name="n_rows">5</property>
                         <property name="n_columns">2</property>
                         <child>
                           <widget class="GtkCheckButton" id="GtkCheckButton_Dbg">
@@ -1473,8 +1473,8 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">3</property>
-                            <property name="bottom_attach">4</property>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
@@ -1523,8 +1523,8 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
@@ -1541,8 +1541,8 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="right_attach">2</property>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
                             <property name="x_options">GTK_FILL</property>
                             <property name="y_options"></property>
                           </packing>
@@ -1593,6 +1593,27 @@
                             <property name="y_options"></property>
                           </packing>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="GtkCheckButton_SlowBoot">
+                            <property name="label" translatable="yes">Slow Boot</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_underline">True</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
                       </widget>
                       <packing>
                         <property name="position">0</property>
@@ -3245,7 +3266,6 @@ Hexadecimal</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <widget class="GtkVBox" id="dialog-vbox9">
         <property name="visible">True</property>
diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
index 3f1ed47a..a49740b4 100644
--- a/gui/ConfDlg.c
+++ b/gui/ConfDlg.c
@@ -799,6 +799,7 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
 	Config.Sio = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Sio")));
 	Config.Mdec = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Mdec")));
 	Config.Cdda = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_CDDA")));
+	Config.SlowBoot = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SlowBoot")));
 	Config.PsxAuto = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")));
 
 	t = Config.Debug;
@@ -858,6 +859,7 @@ void OnConf_Cpu() {
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Sio")), Config.Sio);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_Mdec")), Config.Mdec);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_CDDA")), Config.Cdda);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_SlowBoot")), Config.SlowBoot);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")), Config.PsxAuto);
 
 	g_signal_connect_data(GTK_OBJECT(glade_xml_get_widget(xml, "GtkCheckButton_PsxAuto")), "toggled",
diff --git a/gui/Config.c b/gui/Config.c
index 8ee8bd81..375b5ac5 100644
--- a/gui/Config.c
+++ b/gui/Config.c
@@ -127,6 +127,7 @@ int LoadConfig(PcsxConfig *Conf) {
 	Config.Mdec    = GetValueb(data, "Mdec");
 	Config.PsxAuto = GetValueb(data, "PsxAuto");
 	Config.Cdda    = GetValueb(data, "Cdda");
+	Config.SlowBoot= GetValueb(data, "SlowBoot");
 	Config.Debug   = GetValueb(data, "Dbg");
 	Config.PsxOut  = (Config.PsxOut || GetValueb(data, "PsxOut"));
 	Config.SpuIrq  = GetValueb(data, "SpuIrq");
@@ -167,6 +168,7 @@ void SaveConfig() {
 	SetValueb("Mdec",    Config.Mdec);
 	SetValueb("PsxAuto", Config.PsxAuto);
 	SetValueb("Cdda",    Config.Cdda);
+	SetValueb("SlowBoot",Config.SlowBoot);
 	SetValueb("Dbg",     Config.Debug);
 	SetValueb("PsxOut",  Config.PsxOut);
 	SetValueb("SpuIrq",  Config.SpuIrq);
diff --git a/win32/gui/ConfigurePlugins.c b/win32/gui/ConfigurePlugins.c
index 6f734a1e..2f50bd86 100644
--- a/win32/gui/ConfigurePlugins.c
+++ b/win32/gui/ConfigurePlugins.c
@@ -72,6 +72,7 @@ int LoadConfig() {
 	QueryKeyV("Mdec",     Conf->Mdec);

 	QueryKeyV("PsxAuto",  Conf->PsxAuto);

 	QueryKeyV("Cdda",     Conf->Cdda);

+	QueryKeyV("SlowBoot", Conf->SlowBoot);

 	QueryKeyV("Debug",    Conf->Debug);

 	QueryKeyV("PsxOut",   Conf->PsxOut);

 	QueryKeyV("SpuIrq",   Conf->SpuIrq);

@@ -122,6 +123,7 @@ void SaveConfig() {
 	SetKeyV("Mdec",    Conf->Mdec);

 	SetKeyV("PsxAuto", Conf->PsxAuto);

 	SetKeyV("Cdda",    Conf->Cdda);

+	SetKeyV("SlowBoot",Conf->SlowBoot);

 	SetKeyV("Debug",   Conf->Debug);

 	SetKeyV("PsxOut",  Conf->PsxOut);

 	SetKeyV("SpuIrq",  Conf->SpuIrq);

diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index 309ffecf..c2f889ab 100644
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -1299,6 +1299,7 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 			Button_SetText(GetDlgItem(hW,IDC_SIO),     _("Sio Irq Always Enabled"));

 			Button_SetText(GetDlgItem(hW,IDC_MDEC),    _("Black && White Movies"));

 			Button_SetText(GetDlgItem(hW,IDC_CDDA),    _("Disable Cd audio"));

+			Button_SetText(GetDlgItem(hW,IDC_SLOWBOOT),_("Slow Boot"));

 			Button_SetText(GetDlgItem(hW,IDC_PSXAUTO), _("Autodetect"));

 			Button_SetText(GetDlgItem(hW,IDC_CPU),     _("Enable Interpreter Cpu"));

 			Button_SetText(GetDlgItem(hW,IDC_PSXOUT),  _("Enable Console Output"));

@@ -1314,6 +1315,7 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 			Button_SetCheck(GetDlgItem(hW,IDC_SIO),     Config.Sio);

 			Button_SetCheck(GetDlgItem(hW,IDC_MDEC),    Config.Mdec);

 			Button_SetCheck(GetDlgItem(hW,IDC_CDDA),    Config.Cdda);

+			Button_SetCheck(GetDlgItem(hW,IDC_SLOWBOOT),Config.SlowBoot);

 	   		Button_SetCheck(GetDlgItem(hW,IDC_PSXAUTO), Config.PsxAuto);

 	   		Button_SetCheck(GetDlgItem(hW,IDC_CPU),     (Config.Cpu == CPU_INTERPRETER));

 	   		Button_SetCheck(GetDlgItem(hW,IDC_PSXOUT),  Config.PsxOut);

@@ -1346,6 +1348,7 @@ BOOL CALLBACK ConfigureCpuDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lPar
 					Config.Sio     = Button_GetCheck(GetDlgItem(hW,IDC_SIO));

 					Config.Mdec    = Button_GetCheck(GetDlgItem(hW,IDC_MDEC));

 					Config.Cdda    = Button_GetCheck(GetDlgItem(hW,IDC_CDDA));

+					Config.SlowBoot= Button_GetCheck(GetDlgItem(hW,IDC_SLOWBOOT));

 					Config.PsxAuto = Button_GetCheck(GetDlgItem(hW,IDC_PSXAUTO));

 					tmp = Config.Cpu;

 					Config.Cpu     = (Button_GetCheck(GetDlgItem(hW,IDC_CPU)) ? CPU_INTERPRETER : CPU_DYNAREC);

diff --git a/win32/pcsx.rc b/win32/pcsx.rc
index 2b07248f..81ee5964 100644
--- a/win32/pcsx.rc
+++ b/win32/pcsx.rc
@@ -113,39 +113,41 @@ BEGIN
     GROUPBOX        "",IDC_STATIC,43,100,234,79

 END

 

-IDD_CPUCONF DIALOG DISCARDABLE  0, 0, 232, 175

+IDD_CPUCONF DIALOG DISCARDABLE 0, 0, 232, 194

 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Cpu Config"

 FONT 8, "MS Sans Serif"

 BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,50,155,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,120,155,50,14

+    DEFPUSHBUTTON   "OK",IDOK,50,166,50,14

+    PUSHBUTTON      "Cancel",IDCANCEL,120,166,50,14

     CONTROL         "Disable Xa Decoding",IDC_XA,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,10,15,91,10

+	                WS_TABSTOP,10,15,91,10

     CONTROL         "Sio Irq Always Enabled",IDC_SIO,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,30,92,10

+	                BS_AUTOCHECKBOX | WS_TABSTOP,10,30,92,10

     CONTROL         "Black && White Movies",IDC_MDEC,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,60,100,10

-    CONTROL         "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,10,126,83,10

-    GROUPBOX        "Misc Options",IDC_MISCOPT,5,5,220,100

-    COMBOBOX        IDC_PSXTYPES,105,126,53,50,CBS_DROPDOWNLIST | CBS_SORT | 

-                    WS_VSCROLL | WS_TABSTOP

-    GROUPBOX        "Select Psx System Type",IDC_SELPSX,5,110,220,35

-    CONTROL         "Disable Cd Audio",IDC_CDDA,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,112,15,113,10

+	                BS_AUTOCHECKBOX | WS_TABSTOP,10,60,100,10

+    CONTROL         "Autodetect",IDC_PSXAUTO,"Button",BS_AUTOCHECKBOX |

+	                WS_TABSTOP,10,137,83,10

+    GROUPBOX        "Misc Options",IDC_MISCOPT,5,5,220,114

+    COMBOBOX        IDC_PSXTYPES,105,137,53,50,CBS_DROPDOWNLIST | CBS_SORT |

+	                WS_VSCROLL | WS_TABSTOP

+    GROUPBOX        "Select Psx System Type",IDC_SELPSX,5,123,220,35

+    CONTROL         "Disable Cd Audio",IDC_CDDA,"Button",BS_AUTOCHECKBOX |

+	                WS_TABSTOP,112,15,113,10

     CONTROL         "Enable Console Output",IDC_PSXOUT,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,30,113,10

+	                BS_AUTOCHECKBOX | WS_TABSTOP,112,30,113,10

     CONTROL         "Enable Interpreter Cpu",IDC_CPU,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,112,45,113,10

+	                BS_AUTOCHECKBOX | WS_TABSTOP,112,45,113,10

     CONTROL         "Spu Irq Always Enabled",IDC_SPUIRQ,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,45,91,10

+	                BS_AUTOCHECKBOX | WS_TABSTOP,10,45,91,10

     CONTROL         "Parasite Eve 2, Vandal Hearts 1/2 Fix",IDC_RCNTFIX,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,75,205,10

     CONTROL         "InuYasha Sengoku Battle Fix",IDC_VSYNCWA,"Button",

-                    BS_AUTOCHECKBOX | WS_TABSTOP,10,90,205,10

-    CONTROL         "Enable Debugger",IDC_DEBUG,"Button",BS_AUTOCHECKBOX | 

-                    WS_TABSTOP,112,60,76,10

+	                BS_AUTOCHECKBOX | WS_TABSTOP,10,90,205,10

+    CONTROL         "Enable Debugger",IDC_DEBUG,"Button",BS_AUTOCHECKBOX |

+	                WS_TABSTOP,112,60,76,10

+    CONTROL         "Slow Boot",IDC_SLOWBOOT,"Button",BS_AUTOCHECKBOX |

+	                WS_TABSTOP,10,104,113,10

 END

 

 IDD_NETPLAY DIALOG DISCARDABLE  0, 0, 165, 95

diff --git a/win32/resource.h b/win32/resource.h
index 98bc1fcb..28696b11 100644
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -1,5 +1,5 @@
 //{{NO_DEPENDENCIES}}

-// Microsoft Developer Studio generated include file.

+// Microsoft Visual C++ generated include file.

 // Used by pcsx.rc

 //

 #define IDS_TITLE                       1

@@ -70,6 +70,7 @@
 #define IDC_ASMCHECK3                   1017

 #define IDC_MDEC2                       1017

 #define IDC_CDTIMING                    1017

+#define IDC_SLOWBOOT                    1017

 #define IDC_ASMCHECK4                   1018

 #define IDC_ASMCHECK5                   1019

 #define IDC_RELOAD1                     1019

@@ -299,7 +300,6 @@
 #define ID_HELP_ABOUT                   40002

 #define ID_FILE_RUN_CD                  40003

 #define ID_FILE_RUN_EXE                 40004

-#define ID_FILE_RUN_NOGUI               40016

 #define ID_EMULATOR_PAUSE               40005

 #define ID_EMULATOR_RESET               40006

 #define ID_FILE_RUN_ISO                 40007

@@ -312,9 +312,14 @@
 #define ID_EMULATOR_RUN                 40014

 #define ID_DEBUGREG                     40015

 #define ID_DEBUG_MESSAGES               40015

+#define ID_FILE_RUN_NOGUI               40016

 #define ID_CONFIGURATION_CONTROLLERS    40017

 #define ID_CONFIGURATION                40018

 #define ID_FILE_RUNBIOS                 40026

+#define ID_CONFIGURATION_NETPLAY        40043

+#define ID_EMULATOR_SWITCH_ISO          40044

+#define ID_CONFIGURATION_CHEATLIST      40045

+#define ID_CONFIGURATION_CHEATSEARCH    40046

 #define ID_FILE_STATES_LOAD_SLOT1       40048

 #define ID_FILE_STATES_LOAD_SLOT2       40049

 #define ID_FILE_STATES_LOAD_SLOT3       40050

@@ -335,10 +340,6 @@
 #define ID_FILE_STATES_SAVE_SLOT8       40065

 #define ID_FILE_STATES_SAVE_SLOT9       40066

 #define ID_FILE_STATES_SAVE_OTHER       40067

-#define ID_CONFIGURATION_NETPLAY        40043

-#define ID_EMULATOR_SWITCH_ISO          40044

-#define ID_CONFIGURATION_CHEATLIST      40045

-#define ID_CONFIGURATION_CHEATSEARCH    40046

 #define ID_LANGS                        50000

 

 // Next default values for new objects