C2DUIRomList: use std::vector for files

C2DUIRomList: fix invalid ptr C2DUINXVideo: fix clear buffer Io: use std::string for params
Cpasjuste · Jun 27, 2018 · b347921 · b347921
1 parent 47939f3
commit b347921
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/include/c2dui_romlist.h b/include/c2dui_romlist.h
@@ -68,7 +68,7 @@ namespace c2dui {
         std::vector<Rom *> list;
         std::vector<Hardware> *hardwareList;
         std::vector<std::string> *paths;
-        std::vector<std::string> files[C2DUI_ROMS_PATHS_MAX];
+        std::vector<std::vector<std::string>> files;
         char icon_path[1024];
         char text_str[512];
         float time_start = 0;

diff --git a/libcross2d b/libcross2d
diff --git a/source/c2dui_romlist.cpp b/source/c2dui_romlist.cpp
@@ -59,11 +59,15 @@ C2DUIRomList::C2DUIRomList(C2DUIGuiMain *_ui, const std::string &emuVersion) {
 
     for (unsigned int i = 0; i < paths->size(); i++) {
         //printf("C2DUIRomList: path: `%s`\n", paths->at(i).c_str());
-        if (!paths[i].empty()) {
-            files[i] = ui->getIo()->getDirList(paths->at(i).c_str());
+        if (!paths->at(i).empty()) {
+            //printf("C2DUIRomList: getDirList(%s) - (path=%i)\n", paths->at(i).c_str(), (int) paths->at(i).size());
+            files.emplace_back(ui->getIo()->getDirList(paths->at(i)));
             //printf("C2DUIRomList: found %i files in `%s`\n", (int) files[i].size(), paths->at(i).c_str());
+        } else {
+            files.emplace_back(std::vector<std::string>());
         }
     }
+    printf("C2DUIRomList()\n");
 }
 
 void C2DUIRomList::build() {
@@ -87,15 +91,11 @@ C2DUIRomList::~C2DUIRomList() {
 
     printf("~C2DUIRomList()\n");
 
-    files->clear();
-
     for (auto &rom : list) {
         if (!rom->parent && rom->icon) {
             delete (rom->icon);
             rom->icon = nullptr;
         }
         delete (rom);
     }
-
-    list.clear();
 }
diff --git a/source/c2dui_video_nx.cpp b/source/c2dui_video_nx.cpp
@@ -50,9 +50,8 @@ void C2DUINXVideo::clear() {
 
         gfxFlushBuffers();
         gfxSwapBuffers();
+        gfxWaitForVsync();
     }
-
-    gfxWaitForVsync();
 }
 
 void C2DUINXVideo::draw(c2d::Transform &transform) {