Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1098 from lioncash/master

Browse Source 
Fix swapped statements in scePsmf?
This commit is contained in:
Henrik Rydgård 2013-03-30 02:49:27 -07:00
commit fc8674b496
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/HLE/scePsmf.cpp
View File

@ -902,8 +902,8 @@ u32 scePsmfPlayerChangePlayMode(u32 psmfPlayer, int playMode, int playSpeed)
return ERROR_PSMF_NOT_FOUND;
}
playMode = psmfplayer->playMode;
playSpeed = psmfplayer->playSpeed;
psmfplayer->playMode = playMode;
psmfplayer->playSpeed = playSpeed;
return 0;
}
@ -940,8 +940,8 @@ u32 scePsmfPlayerSelectSpecificVideo(u32 psmfPlayer, int videoCodec, int videoSt
return ERROR_PSMF_NOT_FOUND;
}
videoCodec = psmfplayer->videoCodec;
videoStreamNum = psmfplayer->videoStreamNum;
psmfplayer->videoCodec = videoCodec;
psmfplayer->videoStreamNum = videoStreamNum;
return 0;
}
@ -954,8 +954,8 @@ u32 scePsmfPlayerSelectSpecificAudio(u32 psmfPlayer, int audioCodec, int audioSt
return ERROR_PSMF_NOT_FOUND;
}
audioCodec = psmfplayer->audioCodec;
audioStreamNum = psmfplayer->audioStreamNum;
psmfplayer->audioCodec = audioCodec;
psmfplayer->audioStreamNum = audioStreamNum;
return 0;
}

2
Core/Loaders.cpp
View File

@ -104,7 +104,7 @@ bool LoadFile(const char *filename, std::string *error_string)
pspFileSystem.SetStartingDirectory("disc0:/PSP_GAME/USRDIR");
return Load_PSP_ISO(filename, error_string);
case FILETYPE_ERROR:
ERROR_LOG(LOADER, "Could not file");
ERROR_LOG(LOADER, "Could not read file");
*error_string = "Error reading file";
break;
case FILETYPE_UNKNOWN_BIN: