Merge pull request #5359 from npwoods/lua_effective_frameskip

Making video_manager::effective_frameskip() public and exposing via LUA
This commit is contained in:
R. Belmont 2019-07-20 06:28:16 -04:00 committed by GitHub
commit c53d835ff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View File

@ -788,7 +788,7 @@ inline bool video_manager::effective_autoframeskip() const
// forward // forward
//------------------------------------------------- //-------------------------------------------------
inline int video_manager::effective_frameskip() const int video_manager::effective_frameskip() const
{ {
// if we're fast forwarding, use the maximum frameskip // if we're fast forwarding, use the maximum frameskip
if (m_fastforward) if (m_fastforward)

View File

@ -82,6 +82,7 @@ public:
// current speed helpers // current speed helpers
std::string speed_text(); std::string speed_text();
double speed_percent() const { return m_speed_percent; } double speed_percent() const { return m_speed_percent; }
int effective_frameskip() const;
// snapshots // snapshots
void save_snapshot(screen_device *screen, emu_file &file); void save_snapshot(screen_device *screen, emu_file &file);
@ -116,7 +117,6 @@ private:
// effective value helpers // effective value helpers
bool effective_autoframeskip() const; bool effective_autoframeskip() const;
int effective_frameskip() const;
bool effective_throttle() const; bool effective_throttle() const;
// speed and throttling helpers // speed and throttling helpers

View File

@ -1851,6 +1851,7 @@ void lua_engine::initialize()
"skip_this_frame", &video_manager::skip_this_frame, "skip_this_frame", &video_manager::skip_this_frame,
"speed_factor", &video_manager::speed_factor, "speed_factor", &video_manager::speed_factor,
"speed_percent", &video_manager::speed_percent, "speed_percent", &video_manager::speed_percent,
"effective_frameskip", &video_manager::effective_frameskip,
"frame_update", &video_manager::frame_update, "frame_update", &video_manager::frame_update,
"size", [](video_manager &vm) { "size", [](video_manager &vm) {
s32 width, height; s32 width, height;