azlux/botamusique
1
0
Fork 0
mirror of https://github.com/azlux/botamusique synced 2024-11-23 13:56:17 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: azlux:b7232b8bae802f909464b6eaaa78e65e94667144
Branches Tags
azlux:master
azlux:7.2.3
azlux:7.2.2
azlux:7.2.1
azlux:7.2
azlux:7.1
azlux:7.0
azlux:6.5
azlux:6.4
azlux:6.3
azlux:6.2
azlux:6.1.2
azlux:6.1.1
azlux:6.1
azlux:6.0
azlux:5.2
azlux:5.1
azlux:v3
azlux:1.1
azlux:1.0
..
compare: azlux:e5f623f6c38fca534032f238570d4208ba8fe94e
Branches Tags
azlux:master
azlux:7.2.3
azlux:7.2.2
azlux:7.2.1
azlux:7.2
azlux:7.1
azlux:7.0
azlux:6.5
azlux:6.4
azlux:6.3
azlux:6.2
azlux:6.1.2
azlux:6.1.1
azlux:6.1
azlux:6.0
azlux:5.2
azlux:5.1
azlux:v3
azlux:1.1
azlux:1.0

No commits in common. "b7232b8bae802f909464b6eaaa78e65e94667144" and "e5f623f6c38fca534032f238570d4208ba8fe94e" have entirely different histories.
b7232b8bae ... e5f623f6c3

2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

4
mumbleBot.py
View File

@ -129,7 +129,7 @@ class MumbleBot:
# ====== Volume ====== # ====== Volume ======
self.volume_helper = util.VolumeHelper() self.volume_helper = util.VolumeHelper()
_volume = var.config.getfloat('bot', 'volume', fallback=0.8) _volume = var.config.getfloat('bot', 'volume', fallback=0.1)
if var.db.has_option('bot', 'volume'): if var.db.has_option('bot', 'volume'):
_volume = var.db.getfloat('bot', 'volume') _volume = var.db.getfloat('bot', 'volume')
self.volume_helper.set_volume(_volume) self.volume_helper.set_volume(_volume)
@ -140,7 +140,7 @@ class MumbleBot:
self.last_volume_cycle_time = time.time() self.last_volume_cycle_time = time.time()
self._ducking_volume = 0 self._ducking_volume = 0
_ducking_volume = var.config.getfloat("bot", "ducking_volume", fallback=0.50) _ducking_volume = var.config.getfloat("bot", "ducking_volume", fallback=0.05)
_ducking_volume = var.db.getfloat("bot", "ducking_volume", fallback=_ducking_volume) _ducking_volume = var.db.getfloat("bot", "ducking_volume", fallback=_ducking_volume)
self.volume_helper.set_ducking_volume(_ducking_volume) self.volume_helper.set_ducking_volume(_ducking_volume)

2
util.py
View File

@ -51,7 +51,7 @@ def get_recursive_file_list_sorted(path):
try: try:
mime = magic.from_file(fullpath, mime=True) mime = magic.from_file(fullpath, mime=True)
if 'audio' in mime or 'audio' in magic.from_file(fullpath).lower() or 'video' in mime: if 'audio' in mime or 'audio' in magic.from_file(fullpath).lower() or 'video' in mime:
filelist.append(os.path.join(relroot, file)) filelist.append(relroot + file)
except: except:
pass pass