CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 19:28:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

behavior + is_done + bug fix

Browse Source 
!play behavior
put is_done in EmptyPlayer so bot stops complaining
fixed !queue > !sfx > !mix bug
This commit is contained in:
Irdumb 2016-04-10 10:50:55 +10:00
parent 54dc976f3a
commit 162916db18
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cogs/audio.py
View File

@ -87,7 +87,8 @@ class Audio:
self.playlist = [] self.playlist = []
self.queue.append(link) self.queue.append(link)
self.music_player.paused = False self.music_player.paused = False
if self.music_player.is_playing(): self.music_player.stop() if not self.sfx_player.is_done(): self.sfx_player.stop()
if not self.music_player.is_done(): self.music_player.stop()
await self.bot.say("Playing requested link...") await self.bot.say("Playing requested link...")
else: else:
self.playlist = [] self.playlist = []
@ -647,12 +648,12 @@ class Audio:
await asyncio.sleep(1) await asyncio.sleep(1)
if self.downloader["ID"]: if self.downloader["ID"]:
try: try:
if self.music_player.is_playing(): self.music_player.stop()
# sfx_player should only ever get stuck as much as music_player does # sfx_player should only ever get stuck as much as music_player does
# when it happens to music_player, the reponsibility is put on the user to !stop # when it happens to music_player, the reponsibility is put on the user to !stop
# so we'll do the same with sfx_player. a timeout could be placed here though. # so we'll do the same with sfx_player. a timeout could be placed here though.
while self.sfx_player.is_playing(): while self.sfx_player.is_playing():
await asyncio.sleep(.5) await asyncio.sleep(.5)
if not self.music_player.is_done(): self.music_player.stop()
self.music_player = self.bot.voice.create_ffmpeg_player(path + self.downloader["ID"], options='''-filter:a "volume={}"'''.format(self.settings["VOLUME"])) self.music_player = self.bot.voice.create_ffmpeg_player(path + self.downloader["ID"], options='''-filter:a "volume={}"'''.format(self.settings["VOLUME"]))
self.music_player.paused = False self.music_player.paused = False
self.music_player.start() self.music_player.start()
@ -930,6 +931,9 @@ class EmptyPlayer(): #dummy player
def is_playing(self): def is_playing(self):
return False return False
def is_done(self):
return True
class MaximumLength(Exception): class MaximumLength(Exception):
def __init__(self, m): def __init__(self, m):
self.message = m self.message = m