From dfa027fe09b53485802cb0d6224ffc6bbc058b87 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 6 Nov 2020 14:27:51 +0100 Subject: Refactor: move sequencer modifier .blend I/O to sequencer module Ref T76372. --- source/blender/sequencer/CMakeLists.txt | 7 ++++ source/blender/sequencer/SEQ_sequencer.h | 9 +++++ source/blender/sequencer/intern/modifier.c | 64 ++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) (limited to 'source/blender/sequencer') diff --git a/source/blender/sequencer/CMakeLists.txt b/source/blender/sequencer/CMakeLists.txt index 3841a6e6414..bc3bda8d5b2 100644 --- a/source/blender/sequencer/CMakeLists.txt +++ b/source/blender/sequencer/CMakeLists.txt @@ -23,6 +23,7 @@ set(INC intern ../blenkernel ../blenlib + ../blenloader ../blentranslation ../depsgraph ../imbuf @@ -33,6 +34,9 @@ set(INC ../windowmanager ../../../intern/atomic ../../../intern/guardedalloc + + # dna_type_offsets.h + ${CMAKE_CURRENT_BINARY_DIR}/../makesdna/intern ) set(INC_SYS @@ -72,3 +76,6 @@ if(WITH_AUDASPACE) endif() blender_add_lib(bf_sequencer "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") + +# Needed so we can use dna_type_offsets.h. +add_dependencies(bf_blenkernel bf_dna) diff --git a/source/blender/sequencer/SEQ_sequencer.h b/source/blender/sequencer/SEQ_sequencer.h index d969b43bd50..edd88ba9195 100644 --- a/source/blender/sequencer/SEQ_sequencer.h +++ b/source/blender/sequencer/SEQ_sequencer.h @@ -44,6 +44,9 @@ struct StripElem; struct TextVars; struct bContext; struct bSound; +struct BlendWriter; +struct BlendDataReader; +struct BlendLibReader; /* Wipe effect */ enum { @@ -461,6 +464,12 @@ struct ImBuf *BKE_sequence_modifier_apply_stack(const SeqRenderData *context, void BKE_sequence_modifier_list_copy(struct Sequence *seqn, struct Sequence *seq); int BKE_sequence_supports_modifiers(struct Sequence *seq); +void BKE_sequence_modifier_blend_write(struct BlendWriter *writer, struct ListBase *modbase); +void BKE_sequence_modifier_blend_read_data(struct BlendDataReader *reader, struct ListBase *lb); +void BKE_sequence_modifier_blend_read_lib(struct BlendLibReader *reader, + struct Scene *scene, + struct ListBase *lb); + /* ********************************************************************** * seqeffects.c * diff --git a/source/blender/sequencer/intern/modifier.c b/source/blender/sequencer/intern/modifier.c index cb15028cc23..a7d4ce2801a 100644 --- a/source/blender/sequencer/intern/modifier.c +++ b/source/blender/sequencer/intern/modifier.c @@ -46,6 +46,8 @@ #include "SEQ_sequencer.h" +#include "BLO_read_write.h" + #include "render.h" #include "sequencer.h" @@ -1486,3 +1488,65 @@ int BKE_sequence_supports_modifiers(Sequence *seq) } /** \} */ + +/* -------------------------------------------------------------------- */ +/** \name .blend File I/O + * \{ */ + +void BKE_sequence_modifier_blend_write(BlendWriter *writer, ListBase *modbase) +{ + LISTBASE_FOREACH (SequenceModifierData *, smd, modbase) { + const SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(smd->type); + + if (smti) { + BLO_write_struct_by_name(writer, smti->struct_name, smd); + + if (smd->type == seqModifierType_Curves) { + CurvesModifierData *cmd = (CurvesModifierData *)smd; + + BKE_curvemapping_blend_write(writer, &cmd->curve_mapping); + } + else if (smd->type == seqModifierType_HueCorrect) { + HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd; + + BKE_curvemapping_blend_write(writer, &hcmd->curve_mapping); + } + } + else { + BLO_write_struct(writer, SequenceModifierData, smd); + } + } +} + +void BKE_sequence_modifier_blend_read_data(BlendDataReader *reader, ListBase *lb) +{ + BLO_read_list(reader, lb); + + LISTBASE_FOREACH (SequenceModifierData *, smd, lb) { + if (smd->mask_sequence) { + BLO_read_data_address(reader, &smd->mask_sequence); + } + + if (smd->type == seqModifierType_Curves) { + CurvesModifierData *cmd = (CurvesModifierData *)smd; + + BKE_curvemapping_blend_read(reader, &cmd->curve_mapping); + } + else if (smd->type == seqModifierType_HueCorrect) { + HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd; + + BKE_curvemapping_blend_read(reader, &hcmd->curve_mapping); + } + } +} + +void BKE_sequence_modifier_blend_read_lib(BlendLibReader *reader, Scene *scene, ListBase *lb) +{ + LISTBASE_FOREACH (SequenceModifierData *, smd, lb) { + if (smd->mask_id) { + BLO_read_id_address(reader, scene->id.lib, &smd->mask_id); + } + } +} + +/** \} */ -- cgit v1.2.3