ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed fceud_fstream to use EMUFILE to open the file, should be compilable again

This commit is contained in:
qeed 2010-05-18 19:00:54 +00:00
parent 11e94c3e99
commit ccf831a2fb
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/drivers/sdl/sdl.cpp
View File

@ -440,7 +440,7 @@ FCEUD_Update(uint8 *XBuf,
/** /**
* Opens a file to be read a byte at a time. * Opens a file to be read a byte at a time.
*/ */
std::fstream* FCEUD_UTF8_fstream(const char *fn, const char *m) EMUFILE_FILE* FCEUD_UTF8_fstream(const char *fn, const char *m)
{ {
std::ios_base::openmode mode = std::ios_base::binary; std::ios_base::openmode mode = std::ios_base::binary;
if(!strcmp(m,"r") || !strcmp(m,"rb")) if(!strcmp(m,"r") || !strcmp(m,"rb"))
@ -455,8 +455,8 @@ std::fstream* FCEUD_UTF8_fstream(const char *fn, const char *m)
mode |= std::ios_base::in | std::ios_base::out | std::ios_base::trunc; mode |= std::ios_base::in | std::ios_base::out | std::ios_base::trunc;
else if(!strcmp(m,"a+") || !strcmp(m,"a+b")) else if(!strcmp(m,"a+") || !strcmp(m,"a+b"))
mode |= std::ios_base::in | std::ios_base::out | std::ios_base::app; mode |= std::ios_base::in | std::ios_base::out | std::ios_base::app;
return new EMUFILE_FILE(fn, m);
return new std::fstream(fn,mode); //return new std::fstream(fn,mode);
} }
/** /**
@ -576,7 +576,8 @@ int main(int argc, char *argv[])
if (result == FCM_CONVERTRESULT_SUCCESS) { if (result == FCM_CONVERTRESULT_SUCCESS) {
okcount++; okcount++;
std::fstream* outf = FCEUD_UTF8_fstream (outname, "wb"); // *outf = new EMUFILE;
EMUFILE_FILE* outf = FCEUD_UTF8_fstream (outname, "wb");
md.dump (outf,false); md.dump (outf,false);
delete outf; delete outf;
FCEUD_Message ("Your file has been converted to FM2.\n"); FCEUD_Message ("Your file has been converted to FM2.\n");
@ -610,7 +611,7 @@ int main(int argc, char *argv[])
FCEUFILE *fp = FCEU_fopen(s.c_str(), 0, "rb", 0); FCEUFILE *fp = FCEU_fopen(s.c_str(), 0, "rb", 0);
// load the movie and and subtitles // load the movie and and subtitles
extern bool LoadFM2(MovieData&, std::istream*, int, bool); extern bool LoadFM2(MovieData&, EMUFILE*, int, bool);
LoadFM2(md, fp->stream, INT_MAX, false); LoadFM2(md, fp->stream, INT_MAX, false);
LoadSubtitles(md); // fill subtitleFrames and subtitleMessages LoadSubtitles(md); // fill subtitleFrames and subtitleMessages
delete fp; delete fp;