define default plugins

This commit is contained in:
gen2brain 2013-06-04 15:41:49 +02:00
parent 2203be1f28
commit 514e7952c9
3 changed files with 14 additions and 4 deletions

View file

@ -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

View file

@ -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:

View file

@ -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