UNLOZE/projects-jenz
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update torchlight_changes_unloze/torchlight3/Torchlight/FFmpegAudioPlayer.py

Browse Source
This commit is contained in:
Metroid_Skittles 2026-02-07 07:49:36 +01:00
parent ff3dff14a6
commit 6715d2a07c
1 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
torchlight_changes_unloze/torchlight3/Torchlight/FFmpegAudioPlayer.py
View File

@ -60,6 +60,9 @@ class FFmpegAudioPlayer():
def PlayURI(self, uri, position, rubberband = None, dec_params = None, bitrate = None, def PlayURI(self, uri, position, rubberband = None, dec_params = None, bitrate = None,
backwards = None, *args): backwards = None, *args):
if self.Playing:
self.Stop()
if position: if position:
PosStr = str(datetime.timedelta(seconds = position)) PosStr = str(datetime.timedelta(seconds = position))
#Command = ["/usr/bin/ffmpeg", "-ss", PosStr, "-i", uri, "-acodec", "pcm_s16le", "-ac", "1", "-ar", str(int(self.SampleRate)), "-f", "s16le", "-vn", *args] #Command = ["/usr/bin/ffmpeg", "-ss", PosStr, "-i", uri, "-acodec", "pcm_s16le", "-ac", "1", "-ar", str(int(self.SampleRate)), "-f", "s16le", "-vn", *args]
@ -71,7 +74,13 @@ class FFmpegAudioPlayer():
if args: if args:
Command += list(args) Command += list(args)
# Reset per-play counters/state in case this instance is reused.
self.Seconds = 0.0
self.StartedPlaying = None
self.StoppedPlaying = None
self._byte_remainder = 0
self.Playing = True self.Playing = True
if dec_params: if dec_params:
Command += dec_params Command += dec_params
@ -172,7 +181,7 @@ class FFmpegAudioPlayer():
if SecondsElapsed >= self.Seconds: if SecondsElapsed >= self.Seconds:
if not self.StoppedPlaying: if not self.StoppedPlaying:
print("BUFFER UNDERRUN!") self.Master.Logger.warning("BUFFER UNDERRUN")
self.Stop(False) self.Stop(False)
return return
@ -180,13 +189,17 @@ class FFmpegAudioPlayer():
async def _read_stream(self, stream, writer): async def _read_stream(self, stream, writer):
Started = False Started = False
try:
while stream and self.Playing: while stream and self.Playing:
Data = await stream.read(65536) Data = await stream.read(65536)
if Data: if Data:
try:
writer.write(Data) writer.write(Data)
await writer.drain() await writer.drain()
except (ConnectionError, BrokenPipeError, OSError) as ex:
self.Master.Logger.warning("Voice socket write failed: %s", ex)
break
Bytes = len(Data) Bytes = len(Data)
frame_size = SAMPLEBYTES * self.Channels frame_size = SAMPLEBYTES * self.Channels
@ -214,13 +227,13 @@ class FFmpegAudioPlayer():
else: else:
self.Process = None self.Process = None
break break
finally:
self.StoppedPlaying = time.time() self.StoppedPlaying = time.time()
async def _stream_subprocess(self, cmd): async def _stream_subprocess(self, cmd):
if not self.Playing: if not self.Playing:
return return
try:
_, self.Writer = await asyncio.open_connection(self.Host[0], self.Host[1]) _, self.Writer = await asyncio.open_connection(self.Host[0], self.Host[1])
Process = await asyncio.create_subprocess_exec(*cmd, Process = await asyncio.create_subprocess_exec(*cmd,
@ -230,5 +243,11 @@ class FFmpegAudioPlayer():
await self._read_stream(Process.stdout, self.Writer) await self._read_stream(Process.stdout, self.Writer)
await Process.wait() await Process.wait()
if self.Seconds == 0.0: if self.Playing:
self.Stop(False)
except asyncio.CancelledError:
raise
except Exception:
self.Master.Logger.error(traceback.format_exc())
if self.Playing:
self.Stop() self.Stop()