libretro/beetle-pce-fast-libretro
1
0
Fork 0
mirror of https://github.com/libretro/beetle-pce-fast-libretro.git synced 2024-12-04 06:03:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make ReadM3U code use libretro-common file_stream

Browse Source
This commit is contained in:
twinaphex 2021-04-05 18:31:27 +02:00
parent ec4fe579d1
commit 23752184c1
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libretro.cpp
View File

@ -1427,18 +1427,19 @@ MDFNGI EmulatedPCE_Fast =
2, // Number of output sound channels 2, // Number of output sound channels
}; };
static bool ReadM3U(std::vector<std::string> &file_list, std::string path, unsigned depth = 0) static void ReadM3U(std::vector<std::string> &file_list, std::string path, unsigned depth = 0)
{ {
std::string dir_path; std::string dir_path;
char linebuf[2048]; char linebuf[2048];
FILE *fp = fopen(path.c_str(), "rb"); RFILE *fp = filestream_open(path.c_str(), RETRO_VFS_FILE_ACCESS_READ,
RETRO_VFS_FILE_ACCESS_HINT_NONE);
if (!fp) if (!fp)
return false; return;
MDFN_GetFilePathComponents(path, &dir_path); MDFN_GetFilePathComponents(path, &dir_path);
while(fgets(linebuf, sizeof(linebuf), fp)) while(filestream_gets(fp, linebuf, sizeof(linebuf)) != NULL)
{ {
std::string efp; std::string efp;
@ -1455,15 +1456,13 @@ static bool ReadM3U(std::vector<std::string> &file_list, std::string path, unsig
if(efp == path) if(efp == path)
{ {
log_cb(RETRO_LOG_ERROR, "M3U at \"%s\" references self.\n", efp.c_str()); log_cb(RETRO_LOG_ERROR, "M3U at \"%s\" references self.\n", efp.c_str());
fclose(fp); goto end;
return false;
} }
if(depth == 99) if(depth == 99)
{ {
log_cb(RETRO_LOG_ERROR, "M3U load recursion too deep!\n"); log_cb(RETRO_LOG_ERROR, "M3U load recursion too deep!\n");
fclose(fp); goto end;
return false;
} }
ReadM3U(file_list, efp, depth++); ReadM3U(file_list, efp, depth++);
@ -1472,9 +1471,8 @@ static bool ReadM3U(std::vector<std::string> &file_list, std::string path, unsig
file_list.push_back(efp); file_list.push_back(efp);
} }
fclose(fp); end:
filestream_close(fp);
return true;
} }
static std::vector<CDIF *> CDInterfaces; // FIXME: Cleanup on error out. static std::vector<CDIF *> CDInterfaces; // FIXME: Cleanup on error out.
@ -1489,8 +1487,7 @@ static bool MDFNI_LoadCD(const char *devicename)
{ {
std::vector<std::string> file_list; std::vector<std::string> file_list;
if (ReadM3U(file_list, devicename)) ReadM3U(file_list, devicename);
ret = true;
for(unsigned i = 0; i < file_list.size(); i++) for(unsigned i = 0; i < file_list.size(); i++)
{ {