Scrameupeutchi/librespot-python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve conflicts during import.

Browse Source
This commit is contained in:
kokarare1212
2021-05-21 12:32:15 +09:00
parent 8d86accf48
commit 6848f08448
7 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
librespot/audio/cdn/CdnFeedHelper.py
View File

@@ -31,7 +31,7 @@ class CdnFeedHelper:
streamer = session.cdn().stream_file(file, key, url, halt_listener)
input_stream = streamer.stream()
normalization_data = NormalizationData.read(input_stream)
normalization_data = NormalizationData.NormalizationData.read(input_stream)
if input_stream.skip(0xa7) != 0xa7:
raise IOError("Couldn't skip 0xa7 bytes!")
return PlayableContentFeeder.PlayableContentFeeder.LoadedStream(

2
librespot/audio/cdn/CdnManager.py
View File

@@ -159,7 +159,7 @@ class CdnManager:
else:
self._expiration = -1
class Streamer(GeneralAudioStream, GeneralWritableStream):
class Streamer(GeneralAudioStream.GeneralAudioStream, GeneralWritableStream.GeneralWritableStream):
_session: Session = None
_streamId: StreamId = None
_executorService = concurrent.futures.ThreadPoolExecutor()

2
librespot/audio/cdn/__init__.py
View File

@@ -1,2 +1,2 @@
from librespot.audio.cdn.CdnFeedHelper import CdnFeedHelper
from librespot.audio.cdn.CdnManager import ChannelManager
from librespot.audio.cdn.CdnManager import CdnManager