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

pause music if muted

Browse Source
This commit is contained in:
cidoku 2025-02-20 14:31:50 -03:00
parent 2f0b5f2782
commit 5d62d97464
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
audio.py
View File

@ -133,6 +133,12 @@ Play a handle
""" """
return dll.BASS_ChannelPlay(handle, restart) return dll.BASS_ChannelPlay(handle, restart)
def pausehandle(handle):
"""
Play a handle
"""
return dll.BASS_ChannelPause(handle)
def stophandle(handle): def stophandle(handle):
""" """
Stop handle playback Stop handle playback

12
gameview.py
View File

@ -1255,6 +1255,10 @@ class gui(QtGui.QWidget):
def changeMusicVolume(self, value): def changeMusicVolume(self, value):
if self.music: if self.music:
audio.sethandleattr(self.music, BASS_ATTRIB_VOL, value / 100.0) audio.sethandleattr(self.music, BASS_ATTRIB_VOL, value / 100.0)
if value == 0:
audio.pausehandle(self.music)
elif audio.handleisactive(self.music) == BASS_ACTIVE_PAUSED:
audio.playhandle(self.music, False)
def changeSoundVolume(self, value): def changeSoundVolume(self, value):
if self.sound: if self.sound:
@ -2868,6 +2872,8 @@ class gui(QtGui.QWidget):
self.music = audio.loadhandle(False, AOpath + 'sounds/music/' + musl, 0, 0, BASS_SAMPLE_LOOP) self.music = audio.loadhandle(False, AOpath + 'sounds/music/' + musl, 0, 0, BASS_SAMPLE_LOOP)
audio.sethandleattr(self.music, BASS_ATTRIB_VOL, self.musicslider.value() / 100.0) audio.sethandleattr(self.music, BASS_ATTRIB_VOL, self.musicslider.value() / 100.0)
audio.playhandle(self.music, True) audio.playhandle(self.music, True)
if self.musicslider.value() == 0:
audio.pausehandle(self.music)
elif ini.read_ini_bool("AO2XP.ini", "General", "download music", True): elif ini.read_ini_bool("AO2XP.ini", "General", "download music", True):
if mus.lower().startswith("http"): if mus.lower().startswith("http"):
@ -2884,6 +2890,8 @@ class gui(QtGui.QWidget):
if self.music: if self.music:
audio.sethandleattr(self.music, BASS_ATTRIB_VOL, self.musicslider.value() / 100.0) audio.sethandleattr(self.music, BASS_ATTRIB_VOL, self.musicslider.value() / 100.0)
audio.playhandle(self.music, True) audio.playhandle(self.music, True)
if self.musicslider.value() == 0:
audio.pausehandle(self.music)
else: else:
error = audio.getbasserror() error = audio.getbasserror()
print "[audio] Couldn't play music. Error", error print "[audio] Couldn't play music. Error", error
@ -2926,7 +2934,9 @@ class gui(QtGui.QWidget):
else: else:
self.music = audio.loadhandle(True, self.stream, 0, file_length, BASS_SAMPLE_LOOP) self.music = audio.loadhandle(True, self.stream, 0, file_length, BASS_SAMPLE_LOOP)
audio.sethandleattr(self.music, BASS_ATTRIB_VOL, self.musicslider.value() / 100.0) audio.sethandleattr(self.music, BASS_ATTRIB_VOL, self.musicslider.value() / 100.0)
audio.playhandle(self.music, False) audio.playhandle(self.music, True)
if self.musicslider.value() == 0:
audio.pausehandle(self.music)
def startGame(self, tcp, playerlist, charlist, musiclist, background, evidence, areas, features=[], oocjoin=[], hplist=[], webAO_bucket=""): def startGame(self, tcp, playerlist, charlist, musiclist, background, evidence, areas, features=[], oocjoin=[], hplist=[], webAO_bucket=""):
self.willDisconnect = False self.willDisconnect = False