forked from bartvdbraak/blender
Terminology Trim -> Slip tool. It's how it's mostly called in other
software.
This commit is contained in:
parent
f651a470bf
commit
179ad7dcba
@ -338,7 +338,7 @@ class SEQUENCER_MT_strip(Menu):
|
||||
|
||||
layout.operator("sequencer.cut", text="Cut (hard) at frame").type = 'HARD'
|
||||
layout.operator("sequencer.cut", text="Cut (soft) at frame").type = 'SOFT'
|
||||
layout.operator("sequencer.trim", text="Trim Contents")
|
||||
layout.operator("sequencer.slip", text="Slip Strip Contents")
|
||||
layout.operator("sequencer.images_separate")
|
||||
layout.operator("sequencer.offset_clear")
|
||||
layout.operator("sequencer.deinterlace_selected_movies")
|
||||
|
@ -1232,7 +1232,7 @@ void SEQUENCER_OT_snap(struct wmOperatorType *ot)
|
||||
}
|
||||
|
||||
|
||||
typedef struct TrimData {
|
||||
typedef struct SlipData {
|
||||
int init_mouse[2];
|
||||
float init_mouseloc[2];
|
||||
TransSeq *ts;
|
||||
@ -1241,7 +1241,7 @@ typedef struct TrimData {
|
||||
int num_seq;
|
||||
bool slow;
|
||||
int slow_offset; /* offset at the point where offset was turned on */
|
||||
} TrimData;
|
||||
} SlipData;
|
||||
|
||||
static void transseq_backup(TransSeq *ts, Sequence *seq)
|
||||
{
|
||||
@ -1274,7 +1274,7 @@ static void transseq_restore(TransSeq *ts, Sequence *seq)
|
||||
seq->len = ts->len;
|
||||
}
|
||||
|
||||
static int trim_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool *trim, int offset, bool first_level)
|
||||
static int slip_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool *trim, int offset, bool first_level)
|
||||
{
|
||||
Sequence *seq;
|
||||
int num_items = 0;
|
||||
@ -1287,7 +1287,7 @@ static int trim_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool
|
||||
|
||||
if (seq->type == SEQ_TYPE_META) {
|
||||
/* trim the sub-sequences */
|
||||
num_items += trim_add_sequences_rec(&seq->seqbase, seq_array, trim, num_items + offset, false);
|
||||
num_items += slip_add_sequences_rec(&seq->seqbase, seq_array, trim, num_items + offset, false);
|
||||
}
|
||||
else if (seq->type & SEQ_TYPE_EFFECT) {
|
||||
trim[offset + num_items] = false;
|
||||
@ -1298,7 +1298,7 @@ static int trim_add_sequences_rec(ListBase *seqbasep, Sequence **seq_array, bool
|
||||
return num_items;
|
||||
}
|
||||
|
||||
static int trim_count_sequences_rec(ListBase *seqbasep, bool first_level)
|
||||
static int slip_count_sequences_rec(ListBase *seqbasep, bool first_level)
|
||||
{
|
||||
Sequence *seq;
|
||||
int trimmed_sequences = 0;
|
||||
@ -1309,7 +1309,7 @@ static int trim_count_sequences_rec(ListBase *seqbasep, bool first_level)
|
||||
|
||||
if (seq->type == SEQ_TYPE_META) {
|
||||
/* trim the sub-sequences */
|
||||
trimmed_sequences += trim_count_sequences_rec(&seq->seqbase, false);
|
||||
trimmed_sequences += slip_count_sequences_rec(&seq->seqbase, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1317,9 +1317,9 @@ static int trim_count_sequences_rec(ListBase *seqbasep, bool first_level)
|
||||
return trimmed_sequences;
|
||||
}
|
||||
|
||||
static int sequencer_trim_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
||||
static int sequencer_slip_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
||||
{
|
||||
TrimData *data;
|
||||
SlipData *data;
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
Editing *ed = BKE_sequencer_editing_get(scene, false);
|
||||
float mouseloc[2];
|
||||
@ -1327,18 +1327,18 @@ static int sequencer_trim_invoke(bContext *C, wmOperator *op, const wmEvent *eve
|
||||
View2D *v2d = UI_view2d_fromcontext(C);
|
||||
|
||||
/* first recursively cound the trimmed elements */
|
||||
num_seq = trim_count_sequences_rec(ed->seqbasep, true);
|
||||
num_seq = slip_count_sequences_rec(ed->seqbasep, true);
|
||||
|
||||
if (num_seq == 0)
|
||||
return OPERATOR_CANCELLED;
|
||||
|
||||
data = op->customdata = MEM_mallocN(sizeof(TrimData), "trimdata");
|
||||
data = op->customdata = MEM_mallocN(sizeof(SlipData), "trimdata");
|
||||
data->ts = MEM_mallocN(num_seq * sizeof(TransSeq), "trimdata_transform");
|
||||
data->seq_array = MEM_mallocN(num_seq * sizeof(Sequence *), "trimdata_sequences");
|
||||
data->trim = MEM_mallocN(num_seq * sizeof(bool), "trimdata_trim");
|
||||
data->num_seq = num_seq;
|
||||
|
||||
trim_add_sequences_rec(ed->seqbasep, data->seq_array, data->trim, 0, true);
|
||||
slip_add_sequences_rec(ed->seqbasep, data->seq_array, data->trim, 0, true);
|
||||
|
||||
for (i = 0; i < num_seq; i++) {
|
||||
transseq_backup(data->ts + i, data->seq_array[i]);
|
||||
@ -1356,7 +1356,7 @@ static int sequencer_trim_invoke(bContext *C, wmOperator *op, const wmEvent *eve
|
||||
return OPERATOR_RUNNING_MODAL;
|
||||
}
|
||||
|
||||
static bool sequencer_trim_recursively(Scene *scene, TrimData *data, int offset)
|
||||
static bool sequencer_slip_recursively(Scene *scene, SlipData *data, int offset)
|
||||
{
|
||||
|
||||
/* only data types supported for now */
|
||||
@ -1415,9 +1415,9 @@ static bool sequencer_trim_recursively(Scene *scene, TrimData *data, int offset)
|
||||
return false;
|
||||
}
|
||||
|
||||
static int sequencer_trim_exec(bContext *C, wmOperator *op)
|
||||
static int sequencer_slip_exec(bContext *C, wmOperator *op)
|
||||
{
|
||||
TrimData *data;
|
||||
SlipData *data;
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
Editing *ed = BKE_sequencer_editing_get(scene, false);
|
||||
int num_seq, i;
|
||||
@ -1425,24 +1425,24 @@ static int sequencer_trim_exec(bContext *C, wmOperator *op)
|
||||
bool success = false;
|
||||
|
||||
/* first recursively cound the trimmed elements */
|
||||
num_seq = trim_count_sequences_rec(ed->seqbasep, true);
|
||||
num_seq = slip_count_sequences_rec(ed->seqbasep, true);
|
||||
|
||||
if (num_seq == 0)
|
||||
return OPERATOR_CANCELLED;
|
||||
|
||||
data = op->customdata = MEM_mallocN(sizeof(TrimData), "trimdata");
|
||||
data = op->customdata = MEM_mallocN(sizeof(SlipData), "trimdata");
|
||||
data->ts = MEM_mallocN(num_seq * sizeof(TransSeq), "trimdata_transform");
|
||||
data->seq_array = MEM_mallocN(num_seq * sizeof(Sequence *), "trimdata_sequences");
|
||||
data->trim = MEM_mallocN(num_seq * sizeof(bool), "trimdata_trim");
|
||||
data->num_seq = num_seq;
|
||||
|
||||
trim_add_sequences_rec(ed->seqbasep, data->seq_array, data->trim, 0, true);
|
||||
slip_add_sequences_rec(ed->seqbasep, data->seq_array, data->trim, 0, true);
|
||||
|
||||
for (i = 0; i < num_seq; i++) {
|
||||
transseq_backup(data->ts + i, data->seq_array[i]);
|
||||
}
|
||||
|
||||
success = sequencer_trim_recursively(scene, data, offset);
|
||||
success = sequencer_slip_recursively(scene, data, offset);
|
||||
|
||||
MEM_freeN(data->seq_array);
|
||||
MEM_freeN(data->trim);
|
||||
@ -1453,10 +1453,10 @@ static int sequencer_trim_exec(bContext *C, wmOperator *op)
|
||||
else return OPERATOR_CANCELLED;
|
||||
}
|
||||
|
||||
static int sequencer_trim_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
||||
static int sequencer_slip_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
||||
{
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
TrimData *data = (TrimData *)op->customdata;
|
||||
SlipData *data = (SlipData *)op->customdata;
|
||||
ScrArea *sa = CTX_wm_area(C);
|
||||
|
||||
switch (event->type) {
|
||||
@ -1491,7 +1491,7 @@ static int sequencer_trim_modal(bContext *C, wmOperator *op, const wmEvent *even
|
||||
ED_area_headerprint(sa, msg);
|
||||
}
|
||||
|
||||
if (sequencer_trim_recursively(scene, data, offset)) {
|
||||
if (sequencer_slip_recursively(scene, data, offset)) {
|
||||
WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
|
||||
}
|
||||
break;
|
||||
@ -1562,17 +1562,17 @@ static int sequencer_trim_modal(bContext *C, wmOperator *op, const wmEvent *even
|
||||
return OPERATOR_RUNNING_MODAL;
|
||||
}
|
||||
|
||||
void SEQUENCER_OT_trim(struct wmOperatorType *ot)
|
||||
void SEQUENCER_OT_slip(struct wmOperatorType *ot)
|
||||
{
|
||||
/* identifiers */
|
||||
ot->name = "Trim Strips";
|
||||
ot->idname = "SEQUENCER_OT_trim";
|
||||
ot->idname = "SEQUENCER_OT_slip";
|
||||
ot->description = "Trim the contents of the active strip";
|
||||
|
||||
/* api callbacks */
|
||||
ot->invoke = sequencer_trim_invoke;
|
||||
ot->modal = sequencer_trim_modal;
|
||||
ot->exec = sequencer_trim_exec;
|
||||
ot->invoke = sequencer_slip_invoke;
|
||||
ot->modal = sequencer_slip_modal;
|
||||
ot->exec = sequencer_slip_exec;
|
||||
ot->poll = sequencer_edit_poll;
|
||||
|
||||
/* flags */
|
||||
|
@ -84,7 +84,7 @@ struct wmOperatorType;
|
||||
struct wmKeyConfig;
|
||||
|
||||
void SEQUENCER_OT_cut(struct wmOperatorType *ot);
|
||||
void SEQUENCER_OT_trim(struct wmOperatorType *ot);
|
||||
void SEQUENCER_OT_slip(struct wmOperatorType *ot);
|
||||
void SEQUENCER_OT_mute(struct wmOperatorType *ot);
|
||||
void SEQUENCER_OT_unmute(struct wmOperatorType *ot);
|
||||
void SEQUENCER_OT_lock(struct wmOperatorType *ot);
|
||||
|
@ -50,7 +50,7 @@ void sequencer_operatortypes(void)
|
||||
{
|
||||
/* sequencer_edit.c */
|
||||
WM_operatortype_append(SEQUENCER_OT_cut);
|
||||
WM_operatortype_append(SEQUENCER_OT_trim);
|
||||
WM_operatortype_append(SEQUENCER_OT_slip);
|
||||
WM_operatortype_append(SEQUENCER_OT_mute);
|
||||
WM_operatortype_append(SEQUENCER_OT_unmute);
|
||||
WM_operatortype_append(SEQUENCER_OT_lock);
|
||||
@ -317,7 +317,7 @@ void sequencer_keymap(wmKeyConfig *keyconf)
|
||||
|
||||
WM_keymap_add_menu(keymap, "SEQUENCER_MT_change", CKEY, KM_PRESS, 0, 0);
|
||||
|
||||
WM_keymap_add_item(keymap, "SEQUENCER_OT_trim", TKEY, KM_PRESS, 0, 0);
|
||||
WM_keymap_add_item(keymap, "SEQUENCER_OT_slip", SKEY, KM_PRESS, 0, 0);
|
||||
|
||||
kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_int", OKEY, KM_PRESS, 0, 0);
|
||||
RNA_string_set(kmi->ptr, "data_path", "scene.sequence_editor.overlay_frame");
|
||||
|
Loading…
Reference in New Issue
Block a user