Cleanup: Move BKE_writeavi.h to C++ and rename to BKE_writemovie.hh

Pull Request: https://projects.blender.org/blender/blender/pulls/118506

source/blender/blenkernel/BKE_writemovie.hh

@@ -8,45 +8,41 @@
  * \ingroup bke
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* generic blender movie support, could move to own module */
 
 struct RenderData;
 struct ReportList;
 struct Scene;
 
-typedef struct bMovieHandle {
+struct bMovieHandle {
   int (*start_movie)(void *context_v,
-                     const struct Scene *scene,
-                     struct RenderData *rd,
+                     const Scene *scene,
+                     RenderData *rd,
                      int rectx,
                      int recty,
-                     struct ReportList *reports,
+                     ReportList *reports,
                      bool preview,
                      const char *suffix);
   int (*append_movie)(void *context_v,
-                      struct RenderData *rd,
+                      RenderData *rd,
                       int start_frame,
                       int frame,
                       int *pixels,
                       int rectx,
                       int recty,
                       const char *suffix,
-                      struct ReportList *reports);
+                      ReportList *reports);
   void (*end_movie)(void *context_v);
 
   /* Optional function. */
   void (*get_movie_path)(char filepath[/*FILE_MAX*/ 1024],
-                         const struct RenderData *rd,
+                         const RenderData *rd,
                          bool preview,
                          const char *suffix);
 
   void *(*context_create)(void);
   void (*context_free)(void *context_v);
-} bMovieHandle;
+};
 
 bMovieHandle *BKE_movie_handle_get(char imtype);
 
@@ -54,10 +50,6 @@ bMovieHandle *BKE_movie_handle_get(char imtype);
  * \note Similar to #BKE_image_path_from_imformat()
  */
 void BKE_movie_filepath_get(char filepath[/*FILE_MAX*/ 1024],
-                            const struct RenderData *rd,
+                            const RenderData *rd,
                             bool preview,
                             const char *suffix);
-
-#ifdef __cplusplus
-}
-#endif

source/blender/blenkernel/CMakeLists.txt

@@ -318,7 +318,7 @@ set(SRC
   intern/wm_runtime.cc
   intern/workspace.cc
   intern/world.cc
-  intern/writeavi.cc
+  intern/writemovie.cc
 
   BKE_DerivedMesh.hh
   BKE_action.h
@@ -526,7 +526,7 @@ set(SRC
   BKE_wm_runtime.hh
   BKE_workspace.h
   BKE_world.h
-  BKE_writeavi.h
+  BKE_writemovie.hh
 
   nla_private.h
   particle_private.h

source/blender/blenkernel/intern/writemovie.cc

@@ -3,8 +3,7 @@
  * SPDX-License-Identifier: GPL-2.0-or-later */
 
 /** \file
- * Functions for writing AVI-format files.
- * Added interface for generic movie support (ton)
+ * Functions for writing movie files.
  * \ingroup bke
  */
 
@@ -22,7 +21,7 @@
 #  include "BKE_writeffmpeg.hh"
 #endif
 
-#include "BKE_writeavi.h"
+#include "BKE_writemovie.hh"
 
 static int start_stub(void * /*context_v*/,
                       const Scene * /*scene*/,

source/blender/editors/render/render_opengl.cc

@@ -40,7 +40,7 @@
 #include "BKE_main.hh"
 #include "BKE_report.hh"
 #include "BKE_scene.hh"
-#include "BKE_writeavi.h"
+#include "BKE_writemovie.hh"
 
 #include "DEG_depsgraph.hh"
 #include "DEG_depsgraph_query.hh"

source/blender/makesrna/intern/rna_scene_api.cc

@@ -34,7 +34,7 @@
 #  include "BKE_global.hh"
 #  include "BKE_image.h"
 #  include "BKE_scene.hh"
-#  include "BKE_writeavi.h"
+#  include "BKE_writemovie.hh"
 
 #  include "DEG_depsgraph_query.hh"
 

source/blender/render/intern/pipeline.cc

@@ -59,7 +59,7 @@
 #include "BKE_report.hh"
 #include "BKE_scene.hh"
 #include "BKE_sound.h"
-#include "BKE_writeavi.h" /* <------ should be replaced once with generic movie module */
+#include "BKE_writemovie.hh"
 
 #include "NOD_composite.hh"