Skip to content

Commit

Permalink
moved loggers outside of plugin init into relevant function
Browse files Browse the repository at this point in the history
  • Loading branch information
owen-crook authored and Baekalfen committed Dec 6, 2023
1 parent 50f103e commit b212c13
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
3 changes: 0 additions & 3 deletions pyboy/plugins/window_dummy.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ def __init__(self, pyboy, mb, pyboy_argv):
return

pyboy._rendering(False)
logger.warning(
'This window type does not support frame-limiting. `pyboy.set_emulation_speed(...)` will have no effect, as it\'s always running at full speed.'
)

def enabled(self):
return self.pyboy_argv.get("window_type") == "dummy"
Expand Down
4 changes: 0 additions & 4 deletions pyboy/plugins/window_headless.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,6 @@ def __init__(self, pyboy, mb, pyboy_argv):
if not self.enabled():
return

logger.warning(
'This window type does not support frame-limiting. `pyboy.set_emulation_speed(...)` will have no effect, as it\'s always running at full speed.'
)

def enabled(self):
return self.pyboy_argv.get("window_type") == "headless"

Expand Down
11 changes: 11 additions & 0 deletions pyboy/pyboy.py
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,17 @@ def set_emulation_speed(self, target_speed):
Args:
target_speed (int): Target emulation speed as multiplier of real-time.
"""
if self.initialized:
unsupported_window_types_enabled = [
self.plugin_manager.window_dummy_enabled,
self.plugin_manager.window_headless_enabled,
self.plugin_manager.window_open_gl_enabled
]
if any(unsupported_window_types_enabled):
logger.warning(
'This window type does not support frame-limiting. `pyboy.set_emulation_speed(...)` will have no effect, as it\'s always running at full speed.'
)

if target_speed > 5:
logger.warning("The emulation speed might not be accurate when speed-target is higher than 5")
self.target_emulationspeed = target_speed
Expand Down

0 comments on commit b212c13

Please sign in to comment.