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

move music temporarily back to tcp thread, need to find a way to keep bass from locking up the gui thread

Browse Source
This commit is contained in:
cidoku 2026-02-09 03:46:02 -03:00
parent 8a235c26d4
commit 62a614e435
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gameview.py
View File

@ -4295,8 +4295,8 @@ class GUI(QtGui.QWidget):
elif ini.read_ini_bool("AO2XP.ini", "General", "download music", True): elif ini.read_ini_bool("AO2XP.ini", "General", "download music", True):
if musl.startswith("http"): if musl.startswith("http"):
self.music = audio.loadURLHandle(mus, 0, BASS_SAMPLE_LOOP)
print "[audio] Trying to play", mus print "[audio] Trying to play", mus
self.music = audio.loadURLHandle(mus, 0, BASS_SAMPLE_LOOP)
else: else:
global bucket global bucket
mus = musl = bucket + 'base/sounds/music/' + musl.replace(" ", "%20") mus = musl = bucket + 'base/sounds/music/' + musl.replace(" ", "%20")
@ -4819,7 +4819,6 @@ class GUI(QtGui.QWidget):
self.ICLog.append(timestamp + '%s changed the music to %s' % (name, music)) self.ICLog.append(timestamp + '%s changed the music to %s' % (name, music))
else: else:
self.ICLog.append(timestamp + 'The music was changed to %s' % music) self.ICLog.append(timestamp + 'The music was changed to %s' % music)
self.playMusic(music)
def onModCallReceived(self, reason): def onModCallReceived(self, reason):
if self.sndModCall: if self.sndModCall:

2
packets.py
View File

@ -120,6 +120,8 @@ def handlePackets(caller, total, record=True):
charid = int(network[1]) charid = int(network[1])
showname = decodeAOString(network[2].decode("utf-8")) if len(network) > 2 else None showname = decodeAOString(network[2].decode("utf-8")) if len(network) > 2 else None
caller.playMusicRequested.emit(music, charid, showname) caller.playMusicRequested.emit(music, charid, showname)
# TODO: TEMPORARY, TRYING TO FIND A WAY TO GET THIS OUT OF HERE WITHOUT FREEZING THE GUI THREAD
caller.parent.playMusic(music)
elif header == 'BN': elif header == 'BN':
caller.newBackground.emit(network[1].lower(), True) caller.newBackground.emit(network[1].lower(), True)