Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Antalik <richardantalik@gmail.com>2022-04-04 13:52:48 +0300
committerRichard Antalik <richardantalik@gmail.com>2022-04-04 13:56:43 +0300
commit277fa2f441f4ab2c00e7f329ba34a3466956647c (patch)
treebde615d956239337f88575dc7ce79d26f0f6cf4f /source/blender/makesdna/DNA_sequence_types.h
parent5a0b4e97e67446ef3a180acb0ad03b4cbf91b356 (diff)
VSE: Add channel headers
This patch adds channel region to VSE timeline area for drawing channel headers. It is synchronizedwith timeline region. 3 basic features are implemented - channel visibility, locking and name. Channel data is stored in `SeqTimelineChannel` which can be top-level owned by `Editing`, or it is owned by meta strip to support nesting. Strip properties are completely independent and channel properties are applied on top of particular strip property, thus overriding it. Implementation is separate from channel regions in other editors. This is mainly because style and topology is quite different in VSE. But also code seems to be much more readable this way. Currently channels use functions similar to VSE timeline to draw background to provide illusion of transparency, but only for background and sfra/efra regions. Great portion of this patch is change from using strip visibility and lock status to include channel state - this is facilitated by functions `SEQ_transform_is_locked` and `SEQ_render_is_muted` Originally this included changes in D14263, but patch was split for easier review. Reviewed By: fsiddi, Severin Differential Revision: https://developer.blender.org/D13836
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
-rw-r--r--source/blender/makesdna/DNA_sequence_types.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index c8dd7ca45aa..cb660619a37 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -205,6 +205,7 @@ typedef struct Sequence {
/** List of strips for metastrips. */
ListBase seqbase;
+ ListBase channels; /* SeqTimelineChannel */
/** The linked "bSound" object. */
struct bSound *sound;
@@ -254,11 +255,19 @@ typedef struct Sequence {
typedef struct MetaStack {
struct MetaStack *next, *prev;
ListBase *oldbasep;
+ ListBase *old_channels;
Sequence *parseq;
/* the startdisp/enddisp when entering the meta */
int disp_range[2];
} MetaStack;
+typedef struct SeqTimelineChannel {
+ struct SeqTimelineChannel *next, *prev;
+ char name[64];
+ int index;
+ int flag;
+} SeqTimelineChannel;
+
typedef struct EditingRuntime {
struct SequenceLookup *sequence_lookup;
} EditingRuntime;
@@ -266,9 +275,12 @@ typedef struct EditingRuntime {
typedef struct Editing {
/** Pointer to the current list of seq's being edited (can be within a meta strip). */
ListBase *seqbasep;
+ ListBase *displayed_channels;
+ void *_pad0;
/** Pointer to the top-most seq's. */
ListBase seqbase;
ListBase metastack;
+ ListBase channels; /* SeqTimelineChannel */
/* Context vars, used to be static */
Sequence *act_seq;
@@ -779,6 +791,11 @@ enum {
SEQ_TRANSFORM_FILTER_BILINEAR = 1,
};
+typedef enum eSeqChannelFlag {
+ SEQ_CHANNEL_LOCK = (1 << 0),
+ SEQ_CHANNEL_MUTE = (1 << 1),
+} eSeqChannelFlag;
+
/** \} */
#ifdef __cplusplus