Continuing modernization

intern/generate_adm.py

@@ -25,7 +25,8 @@ from .geom_utils import (speaker_active_time_range,
                          speakers_by_min_distance,
                          speakers_by_start_time)
 
-from .object_mix import (ObjectMix, ObjectMixPool, object_mixes_from_source_groups)
+from .object_mix import (ObjectMix, ObjectMixPool,
+                         object_mixes_from_source_groups)
 
 from .speaker_utils import (all_speakers)
 
@@ -71,7 +72,8 @@ def group_speakers(speakers, scene) -> List[List[bpy.types.Object]]:
     return ret_val
 
 
-def adm_for_object(scene: bpy.types.Scene, sound_object: ObjectMix, room_size, adm_builder, object_index):
+def adm_for_object(scene: bpy.types.Scene, sound_object: ObjectMix, room_size,
+                   adm_builder, object_index):
     fps = scene.render.fps
     frame_start = scene.frame_start
     frame_end = scene.frame_end
@@ -88,7 +90,8 @@ def adm_for_object(scene: bpy.types.Scene, sound_object: ObjectMix, room_size, a
     created.track_uid.bitDepth = sound_object.bits_per_sample
 
 
-def adm_for_scene(scene: bpy.types.Scene, sound_object_mixes: List[ObjectMix], room_size):
+def adm_for_scene(scene: bpy.types.Scene, sound_object_mixes: List[ObjectMix],
+                  room_size):
     adm_builder = ADMBuilder()
 
     frame_start = scene.frame_start
@@ -102,7 +105,8 @@ def adm_for_scene(scene: bpy.types.Scene, sound_object_mixes: List[ObjectMix], r
     adm_builder.create_content(audioContentName="Objects")
 
     for object_index, sound_object in enumerate(sound_object_mixes):
-        adm_for_object(scene, sound_object, room_size, adm_builder, object_index)
+        adm_for_object(scene, sound_object, room_size,
+                       adm_builder, object_index)
 
     adm = adm_builder.adm
 
@@ -114,23 +118,28 @@ def adm_for_scene(scene: bpy.types.Scene, sound_object_mixes: List[ObjectMix], r
 
 
 def bext_data(scene, sample_rate, room_size):
-    description = "SCENE={};ROOM_SIZE={}\n".format(scene.name, room_size).encode("ascii")
-    originator_name = "Blender {}".format(bpy.app.version_string).encode("ascii")
+    description = "SCENE={};ROOM_SIZE={}\n".format(
+        scene.name, room_size).encode("ascii")
+    originator_name = "Blender {}".format(
+        bpy.app.version_string).encode("ascii")
     originator_ref = uuid.uuid1().hex.encode("ascii")
     date10 = strftime("%Y-%m-%d").encode("ascii")
     time8 = strftime("%H:%M:%S").encode("ascii")
-    timeref = int(float(scene.frame_start) * sample_rate / float(scene.render.fps))
+    timeref = int(float(scene.frame_start) *
+                  sample_rate / float(scene.render.fps))
     version = 0
     umid = b"\0" * 64
     pad = b"\0" * 190
 
-    data = struct.pack("<256s32s32s10s8sQH64s190s", description, originator_name,
-                       originator_ref, date10, time8, timeref, version, umid, pad)
+    data = struct.pack("<256s32s32s10s8sQH64s190s", description,
+                       originator_name, originator_ref, date10, time8, timeref,
+                       version, umid, pad)
 
     return data
 
 
-def attach_outfile_metadata(out_format, outfile, room_size, scene, sound_objects):
+def attach_outfile_metadata(out_format, outfile, room_size, scene,
+                            sound_objects):
     adm, chna = adm_for_scene(scene, sound_objects, room_size=room_size)
     outfile.axml = lxml.etree.tostring(adm, pretty_print=True)
     outfile.chna = chna
@@ -159,13 +168,16 @@ def write_outfile_audio_data(outfile, shortest_file, sound_objects):
         cursor = cursor + to_read
 
 
-def write_muxed_wav(mix_pool: ObjectMixPool, scene, out_format, room_size, outfile, shortest_file):
+def write_muxed_wav(mix_pool: ObjectMixPool, scene, out_format, room_size,
+                    outfile, shortest_file):
     sound_objects = mix_pool.object_mixes
-    attach_outfile_metadata(out_format, outfile, room_size, scene, sound_objects)
+    attach_outfile_metadata(out_format, outfile,
+                            room_size, scene, sound_objects)
     write_outfile_audio_data(outfile, shortest_file, sound_objects)
 
 
-def mux_adm_from_object_mix_pool(scene, mix_pool: ObjectMixPool, output_filename, room_size=1.):
+def mux_adm_from_object_mix_pool(scene, mix_pool: ObjectMixPool,
+                                 output_filename, room_size=1.):
     object_count = len(mix_pool.object_mixes)
     assert object_count > 0
 
@@ -188,7 +200,7 @@ def print_partition_results(object_groups, sound_sources, too_far_speakers):
 
 
 def partition_sounds_to_objects(scene, max_objects) -> \
-        tuple[list[list[bpy.types.Speaker]], list[bpy.types.Speaker]]:
+        tuple[list[list[bpy.types.Object]], list[list[bpy.types.Object]]]:
     """
     Allocates sounds in the scene into non-overlapping lists of sounds. The
     second return value is the list of sounds that could not be allocated
@@ -213,8 +225,8 @@ def partition_sounds_to_objects(scene, max_objects) -> \
     return object_groups, too_far_speakers
 
 
-def generate_adm(context: bpy.types.Context, filepath: str, room_size: float, 
-                 max_objects: int) -> dict:
+def generate_adm(context: bpy.types.Context, filepath: str, room_size: float,
+                 max_objects: int) -> set[str]:
     scene = context.scene
 
     object_groups, _ = partition_sounds_to_objects(scene, max_objects)