Make redraw_framebuffer call update_movie_state();

This commit is contained in:
Ilari Liusvaara 2014-03-28 11:44:21 +02:00
parent 1b844492c7
commit b0503ad245
3 changed files with 2 additions and 8 deletions

View file

@ -17,6 +17,7 @@
#include "library/triplebuffer.hpp" #include "library/triplebuffer.hpp"
framebuffer::raw screen_corrupt; framebuffer::raw screen_corrupt;
void update_movie_state();
namespace namespace
{ {
@ -176,6 +177,7 @@ void redraw_framebuffer(framebuffer::raw& todraw, bool no_lua, bool spontaneous)
buffering.put_write(); buffering.put_write();
notify_screen_update(); notify_screen_update();
last_redraw_no_lua = no_lua; last_redraw_no_lua = no_lua;
update_movie_state();
} }
void redraw_framebuffer() void redraw_framebuffer()

View file

@ -500,7 +500,6 @@ public:
{ {
lua_callback_do_frame_emulated(); lua_callback_do_frame_emulated();
location_special = SPECIAL_FRAME_VIDEO; location_special = SPECIAL_FRAME_VIDEO;
update_movie_state();
redraw_framebuffer(screen, false, true); redraw_framebuffer(screen, false, true);
uint32_t g = gcd(fps_n, fps_d); uint32_t g = gcd(fps_n, fps_d);
fps_n /= g; fps_n /= g;
@ -1216,7 +1215,6 @@ void main_loop(struct loaded_rom& rom, struct moviefile& initial, bool load_has_
throw; throw;
} }
system_corrupt = true; system_corrupt = true;
update_movie_state();
redraw_framebuffer(screen_corrupt); redraw_framebuffer(screen_corrupt);
} }

View file

@ -24,8 +24,6 @@
#include <sstream> #include <sstream>
#include <map> #include <map>
void update_movie_state();
namespace namespace
{ {
std::map<std::string, std::pair<framebuffer::font2*, size_t>> fonts_in_use; std::map<std::string, std::pair<framebuffer::font2*, size_t>> fonts_in_use;
@ -437,7 +435,6 @@ bool lsnes_memorywatch_set::rename(const std::string& oldname, const std::string
rebuild(nitems); rebuild(nitems);
std::swap(items, nitems); std::swap(items, nitems);
redraw_framebuffer(); redraw_framebuffer();
update_movie_state();
return true; return true;
} }
@ -453,7 +450,6 @@ void lsnes_memorywatch_set::set(const std::string& name, lsnes_memorywatch_item&
pr->flush(); pr->flush();
} }
redraw_framebuffer(); redraw_framebuffer();
update_movie_state();
} }
std::string lsnes_memorywatch_set::get_value(const std::string& name) std::string lsnes_memorywatch_set::get_value(const std::string& name)
@ -475,7 +471,6 @@ void lsnes_memorywatch_set::set_multi(std::list<std::pair<std::string, lsnes_mem
pr->flush(); pr->flush();
} }
redraw_framebuffer(); redraw_framebuffer();
update_movie_state();
} }
void lsnes_memorywatch_set::set_multi(std::list<std::pair<std::string, std::string>>& list) void lsnes_memorywatch_set::set_multi(std::list<std::pair<std::string, std::string>>& list)
@ -503,7 +498,6 @@ void lsnes_memorywatch_set::clear_multi(const std::set<std::string>& names)
pr->flush(); pr->flush();
} }
redraw_framebuffer(); redraw_framebuffer();
update_movie_state();
} }
void lsnes_memorywatch_set::rebuild(std::map<std::string, lsnes_memorywatch_item>& nitems) void lsnes_memorywatch_set::rebuild(std::map<std::string, lsnes_memorywatch_item>& nitems)