diff --git a/src/m64py/core/defs.py b/src/m64py/core/defs.py index ea5bea6..d4d3d65 100644 --- a/src/m64py/core/defs.py +++ b/src/m64py/core/defs.py @@ -16,6 +16,8 @@ import ctypes as C +from m64py.platform import DLL_EXT + CORE_NAME = "mupen64plus" CORE_API_VERSION = 0x20001 CONFIG_API_VERSION = 0x20000 @@ -139,6 +141,14 @@ PLUGIN_NAME = { M64PLUGIN_INPUT: "Input" } +PLUGIN_DEFAULT = { + M64PLUGIN_NULL: "NULL", + M64PLUGIN_RSP: "mupen64plus-rsp-hle%s" % DLL_EXT, + M64PLUGIN_GFX: "mupen64plus-video-rice%s" % DLL_EXT, + M64PLUGIN_AUDIO: "mupen64plus-audio-sdl%s" % DLL_EXT, + M64PLUGIN_INPUT: "mupen64plus-input-sdl%s" % DLL_EXT + } + m64p_error = C.c_int m64p_GLattr = C.c_int diff --git a/src/m64py/frontend/mainwindow.py b/src/m64py/frontend/mainwindow.py index 98f7107..5c3b343 100644 --- a/src/m64py/frontend/mainwindow.py +++ b/src/m64py/frontend/mainwindow.py @@ -104,9 +104,9 @@ class MainWindow(QMainWindow, Ui_MainWindow): if not sys.platform == "win32": if not fullscreen: width, height = self.keep_aspect(size) - #self.worker.m64p.config.open_section("Video-General") - #self.worker.m64p.config.set_parameter("ScreenWidth", width) - #self.worker.m64p.config.set_parameter("ScreenHeight", height) + self.worker.m64p.config.open_section("Video-General") + self.worker.m64p.config.set_parameter("ScreenWidth", width) + self.worker.m64p.config.set_parameter("ScreenHeight", height) if not fullscreen: video_size = (width << 16) + height else: diff --git a/src/m64py/frontend/worker.py b/src/m64py/frontend/worker.py index d555dd3..f9d66db 100644 --- a/src/m64py/frontend/worker.py +++ b/src/m64py/frontend/worker.py @@ -94,7 +94,7 @@ class Worker(QThread): plugins = {} for plugin_type in PLUGIN_ORDER: text = self.settings.qset.value("Plugins/%s" % ( - PLUGIN_NAME[plugin_type])) + PLUGIN_NAME[plugin_type]), PLUGIN_DEFAULT[plugin_type]) plugins[plugin_type] = text return plugins