cidoku/AO2XP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more linux fixes

Browse Source
This commit is contained in:
cidoku 2025-02-17 19:00:29 -03:00
parent bf0db257e4
commit b3aaf8816d
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio.py
View File

@ -57,13 +57,13 @@ Initialize BASS and the opus plugin
import pybass.pybassmidi as bassmidi import pybass.pybassmidi as bassmidi
if not dll.BASS_Init(ini.read_ini_int("AO2XP.ini", "Audio", "device", -1), freq, 0, 0, 0): if not dll.BASS_Init(ini.read_ini_int("AO2XP.ini", "Audio", "device", -1), freq, 0, 0, 0):
print "[audio] Audio library could not be initialized. Error", self.getbasserror() print "[audio] Audio library could not be initialized. Error", getbasserror()
if not dll.BASS_PluginLoad(os.path.abspath(opus), 0): if not dll.BASS_PluginLoad(os.path.abspath(opus), 0):
print "[audio] Opus plugin failed to load. Error", self.getbasserror() print "[audio] Opus plugin failed to load. Error", getbasserror()
if not dll.BASS_PluginLoad(os.path.abspath(flac), 0): if not dll.BASS_PluginLoad(os.path.abspath(flac), 0):
print "[audio] FLAC plugin failed to load. Error", self.getbasserror() print "[audio] FLAC plugin failed to load. Error", getbasserror()
if not dll.BASS_PluginLoad(os.path.abspath(midi), 0): if not dll.BASS_PluginLoad(os.path.abspath(midi), 0):
print "[audio] MIDI plugin failed to load. Error", self.getbasserror() print "[audio] MIDI plugin failed to load. Error", getbasserror()
if os.path.exists(os.path.abspath("gm.sf2")): if os.path.exists(os.path.abspath("gm.sf2")):
dll.BASS_SetConfigPtr(bassmidi.BASS_CONFIG_MIDI_DEFFONT, "gm.sf2"); dll.BASS_SetConfigPtr(bassmidi.BASS_CONFIG_MIDI_DEFFONT, "gm.sf2");

9
gameview.py
View File

@ -968,7 +968,7 @@ class gui(QtGui.QWidget):
# AO 2.8 # AO 2.8
self.additivebtn = QtGui.QCheckBox(self) self.additivebtn = QtGui.QCheckBox(self)
self.additivebtn.setChecked(False) self.additivebtn.setChecked(False)
self.additivebtn.setText('Additive text') self.additivebtn.setText('Additive')
self.additivebtn.resize(self.additivebtn.sizeHint()) self.additivebtn.resize(self.additivebtn.sizeHint())
self.additivebtn.move(self.nointerruptbtn.x(), self.sfxbutton.y()) self.additivebtn.move(self.nointerruptbtn.x(), self.sfxbutton.y())
self.additivebtn.clicked.connect(self.onAdditiveCheck) self.additivebtn.clicked.connect(self.onAdditiveCheck)
@ -1353,7 +1353,10 @@ class gui(QtGui.QWidget):
effectslist.insert(0, "No effect") effectslist.insert(0, "No effect")
self.effectdropdown.addItems(effectslist) self.effectdropdown.addItems(effectslist)
charname = unicode(charname.toLower()) if isinstance(charname, str):
charname = unicode(charname.lower())
elif isinstance(charname, QtCore.QString):
charname = unicode(charname.toLower())
self.charname = ini.read_ini(AOpath + 'characters/' + charname + '/char.ini', "options", "name", charname).decode('utf-8').lower() self.charname = ini.read_ini(AOpath + 'characters/' + charname + '/char.ini', "options", "name", charname).decode('utf-8').lower()
self.charside = ini.read_ini(AOpath + 'characters/' + charname + '/char.ini', "options", "side", "def") self.charside = ini.read_ini(AOpath + 'characters/' + charname + '/char.ini', "options", "side", "def")
@ -2683,7 +2686,7 @@ class gui(QtGui.QWidget):
else: else:
self.icLog.append(logstart) self.icLog.append(logstart)
self.setBackground(background) self.setBackground(background.lower())
for msg in oocjoin: for msg in oocjoin:
self.ooclog.append(msg) self.ooclog.append(msg)