storm/bragi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Erroneous logic for determining if ffmpeg dies prematurely. Fixed #223.

Browse Source
This commit is contained in:
Terry Geng 2020-11-26 13:09:43 +08:00
parent ff5b1cb1ee
commit 892a1863e7
No known key found for this signature in database
GPG Key ID: F982F8EA1DF720E7
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mumbleBot.py
View File

@ -464,6 +464,7 @@ class MumbleBot:
self._loop_status = f'Wait for buffer {self.mumble.sound_output.get_buffer_size():.3f}'
time.sleep(0.01)
raw_music = None
if self.thread:
# I get raw from ffmpeg thread
# move playhead forward
@ -473,7 +474,7 @@ class MumbleBot:
self.playhead = time.time() - self.song_start_at
raw_music = self.thread.stdout.read(self.pcm_buffer_size)
self.read_pcm_size += self.pcm_buffer_size
self.read_pcm_size += len(raw_music)
if self.redirect_ffmpeg_log:
try:
@ -505,10 +506,11 @@ class MumbleBot:
else:
time.sleep(0.1)
if not self.is_pause and self.thread is None:
if not self.is_pause and not raw_music:
self.thread = None
# bot is not paused, but ffmpeg thread has gone.
# indicate that last song has finished, or the bot just resumed from pause, or something is wrong.
if self.read_pcm_size < self.pcm_buffer_size and len(var.playlist) > 0 \
if self.read_pcm_size < self.pcm_buffer_size \
and var.playlist.current_index != -1 \
and self.last_ffmpeg_err:
current = var.playlist.current_item()