jamie/soundobjects_blender_addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Removing dead code for ADM

Browse Source
This commit is contained in:
Jamie Hardt
2025-11-05 21:38:55 -08:00
parent b83476f820
commit 7b2c3fdc1f
3 changed files with 129 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
intern/object_mix.py
View File

@@ -9,7 +9,7 @@ from .speaker_utils import solo_speakers, unmute_all_speakers
@contextmanager
def adm_object_rendering_context(scene: bpy.types.Scene):
def object_rendering_context(scene: bpy.types.Scene):
old_ff = scene.render.image_settings.file_format
old_codec = scene.render.ffmpeg.audio_codec
old_chans = scene.render.ffmpeg.audio_channels
@@ -34,8 +34,8 @@ class ObjectMix:
self.intermediate_filename = None
self.base_dir = base_dir
self.scene = scene
self._mixdown_file_handle = None
self._mixdown_reader = None
# self._mixdown_file_handle = None
# self._mixdown_reader = None
@property
def frame_start(self):
@@ -73,7 +73,7 @@ class ObjectMix:
return self.sources[0].name
def mixdown(self):
with adm_object_rendering_context(self.scene) as scene:
with object_rendering_context(self.scene) as scene:
solo_speakers(scene, self.sources)
scene_name = bpy.path.clean_name(scene.name)
@@ -83,7 +83,7 @@ class ObjectMix:
self.base_dir, "%s_%s.wav" % (scene_name, speaker_name))
bpy.ops.sound.mixdown(filepath=self.intermediate_filename,
container='WAV', codec='PCM', format='S24')
container='WAV', codec='PCM', format='F32')
print("Created mixdown named {}"
.format(self.intermediate_filename))
@@ -121,8 +121,10 @@ class ObjectMixPool:
return min(lengths)
def object_mixes_from_source_groups(groups: List[List[bpy.types.Object]],
scene: bpy.types.Scene, base_dir: str):
def object_mixes_from_source_groups(
groups: List[List[bpy.types.Object]],
scene: bpy.types.Scene, base_dir: str) -> list[ObjectMix]:
mixes = []
for group in groups:
mixes.append(ObjectMix(sources=group, scene=scene, base_dir=base_dir))