got rid of cdrfilename & cdOpenCase, windows broken for now

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

3 files changed, 21 insertions, 22 deletions

diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index 06598f77..535e42c0 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -136,9 +136,9 @@ void ResetMenuSlots(GladeXML *xml) {
 		widget = glade_xml_get_widget(xml, "net1");
 		gtk_widget_set_sensitive(widget, FALSE);
 		widget = glade_xml_get_widget(xml, "SwitchImage");
-		gtk_widget_set_sensitive(widget, cdrfilename[0]);
+		gtk_widget_set_sensitive(widget, UsingIso());
 		widget = glade_xml_get_widget(xml, "toolbutton_switchimage");
-		gtk_widget_set_sensitive(widget, cdrfilename[0]);
+		gtk_widget_set_sensitive(widget, UsingIso());
 		widget = glade_xml_get_widget(xml, "toolbutton_graphics");
 		gtk_widget_set_sensitive(widget, FALSE);
 		widget = glade_xml_get_widget(xml, "toolbutton_sound");
@@ -434,7 +434,7 @@ void OnFile_RunExe() {
 			gtk_widget_destroy (file_chooser);
 			destroy_main_window();
 
-			cdrfilename[0] = '\0';
+			SetIsoFile(NULL);
 			LoadPlugins();
 			NetOpened = 0;
 
@@ -467,7 +467,7 @@ void OnFile_RunCd() {
 
 	destroy_main_window();
 
-	cdrfilename[0] = '\0';
+	SetIsoFile(NULL);
 	LoadPlugins();
 	NetOpened = 0;
 
@@ -509,7 +509,7 @@ void OnFile_RunBios() {
 
 	destroy_main_window();
 
-	cdrfilename[0] = '\0';
+	SetIsoFile(NULL);
 	LoadPlugins();
 	NetOpened = 0;
 
@@ -590,7 +590,7 @@ void OnFile_RunImage() {
 
 	destroy_main_window();
 
-	strcpy(cdrfilename, filename);
+	SetIsoFile(filename);
 	g_free(filename);
 
 	LoadPlugins();
@@ -675,7 +675,7 @@ void OnEmu_SwitchImage() {
 
 	destroy_main_window();
 
-	strcpy(cdrfilename, filename);
+	SetIsoFile(filename);
 	g_free(filename);
 
 	if (OpenPlugins() == -1) {
@@ -683,7 +683,7 @@ void OnEmu_SwitchImage() {
 		return;
 	}
 
-	cdOpenCase = time(NULL) + 2;
+	SetCdOpenCaseTime(time(NULL) + 2);
 
 	CheatSearchBackupMemory();
 	psxCpu->Execute();
diff --git a/gui/LnxMain.c b/gui/LnxMain.c
index cc6b82cf..8297a917 100644
--- a/gui/LnxMain.c
+++ b/gui/LnxMain.c
@@ -300,17 +300,21 @@ int main(int argc, char *argv[]) {
 			printf("Using config file %s.\n", cfgfile_basename);
 		}
 		else if (!strcmp(argv[i], "-cdfile")) {
+			char isofilename[MAXPATHLEN];
+
 			if (i+1 >= argc) break;
-			strncpy(cdrfilename, argv[++i], MAXPATHLEN);
-			if (cdrfilename[0] != '/') {
+			strncpy(isofilename, argv[++i], MAXPATHLEN);
+			if (isofilename[0] != '/') {
 				getcwd(path, MAXPATHLEN);
-				if (strlen(path) + strlen(cdrfilename) + 1 < MAXPATHLEN) {
+				if (strlen(path) + strlen(isofilename) + 1 < MAXPATHLEN) {
 					strcat(path, "/");
-					strcat(path, cdrfilename);
-					strcpy(cdrfilename, path);
+					strcat(path, isofilename);
+					strcpy(isofilename, path);
 				} else
-					cdrfilename[0] = 0;
+					isofilename[0] = 0;
 			}
+
+			SetIsoFile(isofilename);
 			runcd = RUN_CD;
 		}
 		else if (!strcmp(argv[i], "-h") ||
@@ -402,7 +406,7 @@ int main(int argc, char *argv[]) {
 	chdir(plugin_default_dir);
 	g_free(plugin_default_dir);
 
-	if (UseGui) cdrfilename[0] = '\0';
+	if (UseGui) SetIsoFile(NULL);
 
 	if (SysInit() == -1) return 1;
 
diff --git a/gui/Plugin.c b/gui/Plugin.c
index ab4101b9..98e057da 100644
--- a/gui/Plugin.c
+++ b/gui/Plugin.c
@@ -39,7 +39,6 @@ unsigned long gpuDisp;
 
 int StatesC = 0;
 extern int UseGui;
-extern int cdOpenCase;
 int ShowPic = 0;
 
 void gpuShowPic() {
@@ -223,10 +222,10 @@ void PADhandleKey(int key) {
 			GPU_makeSnapshot();
 			break;
 		case XK_F9:
-			cdOpenCase = -1;
+			SetCdOpenCaseTime(-1);
 			break;
 		case XK_F10:
-			cdOpenCase = 0;
+			SetCdOpenCaseTime(0);
 			break;
 		case XK_Escape:
 			// TODO
@@ -262,10 +261,6 @@ void SignalExit(int sig) {
 	OnFile_Exit();
 }
 
-void SPUirq(void);
-
-int NetOpened = 0;
-
 #define PARSEPATH(dst, src) \
 	ptr = src + strlen(src); \
 	while (*ptr != '\\' && ptr != src) ptr--; \