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

wndmain.c, lnxmain.c, gtk2gui.c, emuthread.m

Browse Source 
- Patch 7713
- (dario86) Detect PAL demos (SCED)
- (dario86) Fix PAL auto-detection with root counter init


git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@61080 e17a0e51-4ae3-4d35-97c3-1a29b211df97
This commit is contained in:
SND\shalma_cp 2010-12-11 17:54:31 +00:00
parent 2975b7e284
commit d58b2a17cd
4 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gui/Gtk2Gui.c
View File

@ -467,6 +467,7 @@ void OnFile_RunExe() {
g_free(file);
SysRunGui();
} else {
// Auto-detect: get region first, then rcnt-bios reset
SysReset();
if (Load(file) == 0) {
@ -501,8 +502,6 @@ void OnFile_RunCd() {
return;
}
SysReset();
if (CheckCdrom() == -1) {
/* Only check the CD if we are starting the console with a CD */
ClosePlugins();
@ -511,6 +510,9 @@ void OnFile_RunCd() {
return;
}
// Auto-detect: get region first, then rcnt-bios reset
SysReset();
// Read main executable directly from CDRom and start it
if (LoadCdrom() == -1) {
ClosePlugins();
@ -641,8 +643,6 @@ void OnFile_RunImage() {
return;
}
SysReset();
if (CheckCdrom() == -1) {
// Only check the CD if we are starting the console with a CD
ClosePlugins();
@ -651,6 +651,9 @@ void OnFile_RunImage() {
return;
}
// Auto-detect: get region first, then rcnt-bios reset
SysReset();
// Read main executable directly from CDRom and start it
if (LoadCdrom() == -1) {
ClosePlugins();
@ -691,12 +694,13 @@ void OnEmu_Reset() {
return;
}
SysReset();
if (CheckCdrom() != -1) {
LoadCdrom();
}
// Auto-detect: get region first, then rcnt-bios reset
SysReset();
psxCpu->Execute();
}
@ -794,11 +798,6 @@ void state_load(gchar *state_filename) {
ret = CheckState(state_filename);
if (ret == 0) {
SysReset();
ret = LoadState(state_filename);
}
if (ret == 0) {
// Check the CD-ROM is valid
if (CheckCdrom() == -1) {
@ -806,7 +805,11 @@ void state_load(gchar *state_filename) {
SysRunGui();
return;
}
// Auto-detect: region first, then rcnt reset
SysReset();
ret = LoadState(state_filename);
sprintf(Text, _("Loaded state %s."), state_filename);
GPU_displayText(Text);
} else {

4
gui/LnxMain.c
View File

@ -424,9 +424,11 @@ int main(int argc, char *argv[]) {
return 1;
}
SysReset();
CheckCdrom();
// Auto-detect: get region first, then rcnt-bios reset
SysReset();
if (file[0] != '\0') {
Load(file);
} else {

7
macosx/EmuThread.m
View File

@ -56,15 +56,16 @@ static pthread_mutex_t eventMutex;
setjmp(restartJmp);
EmuReset();
int res = CheckCdrom();
if (res == -1) {
ClosePlugins();
SysMessage(_("Could not check CD-ROM!\n"));
goto done;
}
// Auto-detect: region first, then rcnt reset
EmuReset();
LoadCdrom();
if (defrostPath) {

25
win32/gui/WndMain.c
View File

@ -455,13 +455,16 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
RestoreWindow();
return TRUE;
}
SysReset();
if (CheckCdrom() == -1) {
ClosePlugins();
RestoreWindow();
SysMessage(_("The CD does not appear to be a valid Playstation CD"));
return TRUE;
}
// Auto-detect: region first, then rcnt reset
SysReset();
if (LoadCdrom() == -1) {
ClosePlugins();
RestoreWindow();
@ -504,13 +507,16 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
RestoreWindow();
return TRUE;
}
SysReset();
if (CheckCdrom() == -1) {
ClosePlugins();
RestoreWindow();
SysMessage(_("The CD does not appear to be a valid Playstation CD"));
return TRUE;
}
// Auto-detect: region first, then rcnt reset
SysReset();
if (LoadCdrom() == -1) {
ClosePlugins();
RestoreWindow();
@ -532,8 +538,11 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
RestoreWindow();
return TRUE;
}
SysReset();
CheckCdrom();
// Auto-detect: region first, then rcnt reset
SysReset();
Load(File);
Running = 1;
psxCpu->Execute();
@ -569,13 +578,16 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
RestoreWindow();
return TRUE;
}
SysReset();
if (CheckCdrom() == -1) {
fprintf(stderr, _("The CD does not appear to be a valid Playstation CD"));
ClosePlugins();
RestoreWindow();
return TRUE;
}
// Auto-detect: region first, then rcnt reset
SysReset();
if (LoadCdrom() == -1) {
fprintf(stderr, _("Could not load CD-ROM!"));
ClosePlugins();
@ -599,8 +611,11 @@ LRESULT WINAPI MainWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
case ID_EMULATOR_RESET:
SetMenu(hWnd, NULL);
OpenPlugins(hWnd);
SysReset();
CheckCdrom();
// Auto-detect: region first, then rcnt reset
SysReset();
LoadCdrom();
ShowCursor(FALSE);
Running = 1;