Refactor slotcache to be instance variable

include/core/emustatus.hpp

@@ -7,6 +7,8 @@
 #include <map>
 #include "library/triplebuffer.hpp"
 
+class movie_logic;
+
 struct _lsnes_status
 {
 	const static int pause_none;			//pause: No pause.
@@ -40,4 +42,15 @@ struct _lsnes_status
 	std::map<std::string, std::u32string> lvars;	//Lua variables.
 };
 
+struct slotinfo_cache
+{
+	slotinfo_cache(movie_logic& _mlogic);
+	std::string get(const std::string& _filename);
+	void flush(const std::string& _filename);
+	void flush();
+private:
+	std::map<std::string, std::string> cache;
+	movie_logic& mlogic;
+};
+
 #endif

include/core/instance.hpp

@@ -23,6 +23,7 @@ class input_queue;
 class master_dumper;
 class button_mapping;
 class emulator_dispatch;
+class slotinfo_cache;
 namespace command { class group; }
 namespace lua { class state; }
 namespace settingvar { class group; }
@@ -113,6 +114,7 @@ struct emulator_instance
 	emu_framebuffer* fbuf;
 	input_queue* iqueue;
 	master_dumper* mdumper;
+	slotinfo_cache* slotcache;
 	threads::id emu_thread;
 	dtor_list D;
 private:

src/core/emustatus.cpp

@@ -1,7 +1,48 @@
 #include "core/emustatus.hpp"
+#include "core/movie.hpp"
+#include "core/moviedata.hpp"
+#include "core/moviefile.hpp"
+
+#include <sstream>
 
 const int _lsnes_status::pause_none = 0;
 const int _lsnes_status::pause_normal = 1;
 const int _lsnes_status::pause_break = 2;
 const uint64_t _lsnes_status::subframe_savepoint = 0xFFFFFFFFFFFFFFFEULL;
 const uint64_t _lsnes_status::subframe_video = 0xFFFFFFFFFFFFFFFFULL;
+
+slotinfo_cache::slotinfo_cache(movie_logic& _mlogic)
+	: mlogic(_mlogic)
+{
+}
+
+std::string slotinfo_cache::get(const std::string& _filename)
+{
+	std::string filename = resolve_relative_path(_filename);
+	if(!cache.count(filename)) {
+		std::ostringstream out;
+		try {
+			moviefile::brief_info info(filename);
+			if(!mlogic)
+				out << "No movie";
+			else if(mlogic.get_mfile().projectid == info.projectid)
+				out << info.rerecords << "R/" << info.current_frame << "F";
+			else
+				out << "Wrong movie";
+		} catch(...) {
+			out << "Nonexistent";
+		}
+		cache[filename] = out.str();
+	}
+	return cache[filename];
+}
+
+void slotinfo_cache::flush(const std::string& _filename)
+{
+	cache.erase(resolve_relative_path(_filename));
+}
+
+void slotinfo_cache::flush()
+{
+	cache.clear();
+}

src/core/instance.cpp

@@ -72,6 +72,7 @@ emulator_instance::emulator_instance()
 	D.init(command);
 	D.init(iqueue, *command);
 	D.init(mlogic);
+	D.init(slotcache, *mlogic);
 	D.init(memory);
 	D.init(lua);
 	D.init(mwatch, *memory, *project, *fbuf);

src/core/mainloop.cpp

@@ -134,48 +134,6 @@ namespace
 	{
 		return (stringfmt() << "$SLOT:" << (i + 1)).str();
 	}
-
-	std::map<std::string, std::string> slotinfo_cache;
-
-	std::string vector_to_string(const std::vector<char>& x)
-	{
-		std::string y(x.begin(), x.end());
-		while(y.length() > 0 && y[y.length() - 1] < 32)
-			y = y.substr(0, y.length() - 1);
-		return y;
-	}
-
-	std::string get_slotinfo(const std::string& _filename)
-	{
-		auto& core = CORE();
-		std::string filename = resolve_relative_path(_filename);
-		if(!slotinfo_cache.count(filename)) {
-			std::ostringstream out;
-			try {
-				moviefile::brief_info info(filename);
-				if(!*core.mlogic)
-					out << "No movie";
-				else if(core.mlogic->get_mfile().projectid == info.projectid)
-					out << info.rerecords << "R/" << info.current_frame << "F";
-				else
-					out << "Wrong movie";
-			} catch(...) {
-				out << "Nonexistent";
-			}
-			slotinfo_cache[filename] = out.str();
-		}
-		return slotinfo_cache[filename];
-	}
-
-	void flush_slotinfo(const std::string& filename)
-	{
-		slotinfo_cache.erase(resolve_relative_path(filename));
-	}
-
-	void flush_slotinfo()
-	{
-		slotinfo_cache.clear();
-	}
 }
 
 void mainloop_signal_need_rewind(void* ptr)
@@ -291,17 +249,18 @@ namespace
 
 	void mark_pending_save(std::string filename, int smode, int binary)
 	{
+		auto& core = CORE();
 		int tmp = -1;
 		if(smode == SAVE_MOVIE) {
 			//Just do this immediately.
 			do_save_movie(filename, binary);
-			flush_slotinfo(translate_name_mprefix(filename, tmp, -1));
+			core.slotcache->flush(translate_name_mprefix(filename, tmp, -1));
 			return;
 		}
 		if(location_special == SPECIAL_SAVEPOINT) {
 			//We can save immediately here.
 			do_save_state(filename, binary);
-			flush_slotinfo(translate_name_mprefix(filename, tmp, -1));
+			core.slotcache->flush(translate_name_mprefix(filename, tmp, -1));
 			return;
 		}
 		queued_saves.insert(std::make_pair(filename, binary));
@@ -385,7 +344,7 @@ void update_movie_state()
 			int tmp = -1;
 			std::string sfilen = translate_name_mprefix(save_jukebox_name(save_jukebox_pointer), tmp, -1);
 			_status.saveslot = save_jukebox_pointer + 1;
-			_status.slotinfo = utf8::to32(get_slotinfo(sfilen));
+			_status.slotinfo = utf8::to32(core.slotcache->get(sfilen));
 		} else {
 			_status.saveslot_valid = false;
 		}
@@ -949,7 +908,7 @@ namespace
 	command::fnptr<> flushslots(lsnes_cmds, "flush-slotinfo", "Flush slotinfo cache",
 		"Flush slotinfo cache\n",
 		[]() throw(std::bad_alloc, std::runtime_error) {
-			flush_slotinfo();
+			CORE().slotcache->flush();
 		});
 
 	command::fnptr<> mhold1(lsnes_cmds, "+hold-macro", "Hold macro (hold)",
@@ -1150,7 +1109,7 @@ jumpback:
 				core.project->set(&p);
 				if(core.project->get() != old)
 					delete old;
-				flush_slotinfo();	//Wrong movie may be stale.
+				core.slotcache->flush();		//Wrong movie may be stale.
 				return 1;
 			} catch(std::exception& e) {
 				platform::error_message(std::string("Can't switch projects: ") + e.what());
@@ -1200,7 +1159,7 @@ nothing_to_do:
 					goto jumpback;
 			}
 			if(old_project != (*core.mlogic ? core.mlogic->get_mfile().projectid : ""))
-				flush_slotinfo();	//Wrong movie may be stale.
+				core.slotcache->flush();	//Wrong movie may be stale.
 			return 1;
 		}
 		return 0;
@@ -1217,7 +1176,7 @@ nothing_to_do:
 			for(auto i : queued_saves) {
 				do_save_state(i.first, i.second);
 				int tmp = -1;
-				flush_slotinfo(translate_name_mprefix(i.first, tmp, -1));
+				core.slotcache->flush(translate_name_mprefix(i.first, tmp, -1));
 			}
 			if(do_unsafe_rewind && !unsafe_rewind_obj) {
 				uint64_t t = framerate_regulator::get_utime();
@@ -1391,7 +1350,7 @@ void set_stop_at_frame(uint64_t frame)
 
 void do_flush_slotinfo()
 {
-	flush_slotinfo();
+	CORE().slotcache->flush();
 }
 
 void switch_projects(const std::string& newproj)

src/platform/wxwidgets/editor-authors.cpp

@@ -11,8 +11,6 @@
 #include <wx/control.h>
 #include <wx/combobox.h>
 
-void do_flush_slotinfo();
-
 class wxeditor_authors : public wxDialog
 {
 public: