Changed name of cue class methoChanged name of cue class method

This commit is contained in:
Jamie Hardt
2023-11-06 22:40:29 -08:00
parent 9f0b1f1106
commit 1a6349bdd8
2 changed files with 4 additions and 3 deletions

View File

@@ -169,7 +169,7 @@ class WavCuesReader:
notes: List[NoteEntry]
@classmethod
def merge(cls, f,
def read_all(cls, f,
cues: Optional[ChunkDescriptor],
labls: List[ChunkDescriptor],
ltxts: List[ChunkDescriptor],

View File

@@ -204,7 +204,7 @@ class WavInfoReader:
ltxts = [c for c in adtl.children if c.ident == b'ltxt']
notes = [c for c in adtl.children if c.ident == b'note']
return WavCuesReader.merge(f, cue, labls, ltxts, notes,
return WavCuesReader.read_all(f, cue, labls, ltxts, notes,
fallback_encoding=self.info_encoding)
def walk(self) -> Generator[str,str,Any]: #FIXME: this should probably be named "iter()"
@@ -216,7 +216,8 @@ class WavInfoReader:
"fmt", "data", "ixml", "bext", "info", "dolby", "cues" or "adm".
"""
scopes = ('fmt', 'data', 'ixml', 'bext', 'info', 'adm', 'cues', 'dolby')
scopes = ('fmt', 'data', 'ixml', 'bext', 'info', 'adm', 'cues',
'dolby')
for scope in scopes:
if scope in ['fmt', 'data']: