Move Scene.file_writer

Author: eulertour

manim/__main__.py

@@ -79,7 +79,7 @@ def main():
                 else:
                     scene = SceneClass()
                     scene.render()
-                    open_file_if_needed(scene.file_writer)
+                    open_file_if_needed(scene.renderer.file_writer)
             except Exception:
                 print("\n\n")
                 traceback.print_exc()

manim/renderer/cairo_renderer.py

@@ -4,6 +4,7 @@
 from ..utils.exceptions import EndSceneEarlyException
 from ..utils.hashing import get_hash_from_play_call, get_hash_from_wait_call
 from ..constants import DEFAULT_WAIT_TIME
+from ..scene.scene_file_writer import SceneFileWriter
 
 
 def handle_caching_play(func):
@@ -85,9 +86,12 @@ class CairoRenderer:
     time: time elapsed since initialisation of scene.
     """
 
-    def __init__(self, scene, camera, file_writer):
+    def __init__(self, scene, camera):
         self.camera = camera
-        self.file_writer = file_writer
+        self.file_writer = SceneFileWriter(
+            scene,
+            **file_writer_config,
+        )
         self.scene = scene
         self.original_skipping_status = file_writer_config["skip_animations"]
         self.play_hashes_list = []

manim/scene/scene.py

@@ -66,11 +66,7 @@ def construct(self):
     def __init__(self, **kwargs):
         Container.__init__(self, **kwargs)
         self.camera = self.camera_class(**camera_config)
-        self.file_writer = SceneFileWriter(
-            self,
-            **file_writer_config,
-        )
-        self.renderer = CairoRenderer(self, self.camera, self.file_writer)
+        self.renderer = CairoRenderer(self, self.camera)
 
         self.mobjects = []
         # TODO, remove need for foreground mobjects
@@ -920,4 +916,4 @@ def add_sound(self, sound_file, time_offset=0, gain=None, **kwargs):
         if file_writer_config["skip_animations"]:
             return
         time = self.time + time_offset
-        self.file_writer.add_sound(sound_file, time, gain, **kwargs)
+        self.renderer.file_writer.add_sound(sound_file, time, gain, **kwargs)