From 1a6349bdd8fb372b49fd8392f9c2ab44d67c7caa Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Mon, 6 Nov 2023 22:40:29 -0800 Subject: [PATCH] Changed name of cue class methoChanged name of cue class method --- wavinfo/wave_cues_reader.py | 2 +- wavinfo/wave_reader.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wavinfo/wave_cues_reader.py b/wavinfo/wave_cues_reader.py index 2805a7d..5283e0b 100644 --- a/wavinfo/wave_cues_reader.py +++ b/wavinfo/wave_cues_reader.py @@ -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], diff --git a/wavinfo/wave_reader.py b/wavinfo/wave_reader.py index 53a90ff..85993e8 100644 --- a/wavinfo/wave_reader.py +++ b/wavinfo/wave_reader.py @@ -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']: