[Bf-blender-cvs] [e5df87b1b9d] master: Cleanup: split sequencer_edit.c file
Richard Antalik
noreply at git.blender.org
Thu Nov 19 10:06:10 CET 2020
Commit: e5df87b1b9dbba755fa73ccc90d2f6acedc1ad37
Author: Richard Antalik
Date: Thu Nov 19 09:54:40 2020 +0100
Branches: master
https://developer.blender.org/rBe5df87b1b9dbba755fa73ccc90d2f6acedc1ad37
Cleanup: split sequencer_edit.c file
Move proxy operator functions to own file.
No functional changes.
===================================================================
M source/blender/editors/space_sequencer/CMakeLists.txt
M source/blender/editors/space_sequencer/sequencer_edit.c
A source/blender/editors/space_sequencer/sequencer_proxy.c
===================================================================
diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt
index 2ee11f1abfd..e1c193b0c15 100644
--- a/source/blender/editors/space_sequencer/CMakeLists.txt
+++ b/source/blender/editors/space_sequencer/CMakeLists.txt
@@ -42,6 +42,7 @@ set(SRC
sequencer_modifier.c
sequencer_ops.c
sequencer_preview.c
+ sequencer_proxy.c
sequencer_scopes.c
sequencer_select.c
sequencer_view.c
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 9594aaf28a9..972b0b1cdfa 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -124,142 +124,6 @@ typedef struct TransSeq {
/** \} */
-/* -------------------------------------------------------------------- */
-/** \name Proxy Job Manager
- * \{ */
-
-typedef struct ProxyBuildJob {
- struct Main *main;
- struct Depsgraph *depsgraph;
- Scene *scene;
- ListBase queue;
- int stop;
-} ProxyJob;
-
-static void proxy_freejob(void *pjv)
-{
- ProxyJob *pj = pjv;
-
- BLI_freelistN(&pj->queue);
-
- MEM_freeN(pj);
-}
-
-/* Only this runs inside thread. */
-static void proxy_startjob(void *pjv, short *stop, short *do_update, float *progress)
-{
- ProxyJob *pj = pjv;
- LinkData *link;
-
- for (link = pj->queue.first; link; link = link->next) {
- struct SeqIndexBuildContext *context = link->data;
-
- SEQ_proxy_rebuild(context, stop, do_update, progress);
-
- if (*stop) {
- pj->stop = 1;
- fprintf(stderr, "Canceling proxy rebuild on users request...\n");
- break;
- }
- }
-}
-
-static void proxy_endjob(void *pjv)
-{
- ProxyJob *pj = pjv;
- Editing *ed = BKE_sequencer_editing_get(pj->scene, false);
- LinkData *link;
-
- for (link = pj->queue.first; link; link = link->next) {
- SEQ_proxy_rebuild_finish(link->data, pj->stop);
- }
-
- BKE_sequencer_free_imbuf(pj->scene, &ed->seqbase, false);
-
- WM_main_add_notifier(NC_SCENE | ND_SEQUENCER, pj->scene);
-}
-
-static void seq_proxy_build_job(const bContext *C, ReportList *reports)
-{
- wmJob *wm_job;
- ProxyJob *pj;
- struct Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
- Scene *scene = CTX_data_scene(C);
- Editing *ed = BKE_sequencer_editing_get(scene, false);
- ScrArea *area = CTX_wm_area(C);
- Sequence *seq;
- GSet *file_list;
-
- if (ed == NULL) {
- return;
- }
-
- wm_job = WM_jobs_get(CTX_wm_manager(C),
- CTX_wm_window(C),
- scene,
- "Building Proxies",
- WM_JOB_PROGRESS,
- WM_JOB_TYPE_SEQ_BUILD_PROXY);
-
- pj = WM_jobs_customdata_get(wm_job);
-
- if (!pj) {
- pj = MEM_callocN(sizeof(ProxyJob), "proxy rebuild job");
-
- pj->depsgraph = depsgraph;
- pj->scene = scene;
- pj->main = CTX_data_main(C);
-
- WM_jobs_customdata_set(wm_job, pj, proxy_freejob);
- WM_jobs_timer(wm_job, 0.1, NC_SCENE | ND_SEQUENCER, NC_SCENE | ND_SEQUENCER);
- WM_jobs_callbacks(wm_job, proxy_startjob, NULL, NULL, proxy_endjob);
- }
-
- file_list = BLI_gset_new(BLI_ghashutil_strhash_p, BLI_ghashutil_strcmp, "file list");
- bool selected = false; /* Check for no selected strips */
-
- SEQ_CURRENT_BEGIN (ed, seq) {
- if (!ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_META) ||
- (seq->flag & SELECT) == 0) {
- continue;
- }
-
- selected = true;
- if (!(seq->flag & SEQ_USE_PROXY)) {
- BKE_reportf(reports, RPT_WARNING, "Proxy is not enabled for %s, skipping", seq->name);
- continue;
- }
- if (seq->strip->proxy->build_size_flags == 0) {
- BKE_reportf(reports, RPT_WARNING, "Resolution is not selected for %s, skipping", seq->name);
- continue;
- }
-
- bool success = SEQ_proxy_rebuild_context(
- pj->main, pj->depsgraph, pj->scene, seq, file_list, &pj->queue);
-
- if (!success && (seq->strip->proxy->build_flags & SEQ_PROXY_SKIP_EXISTING) != 0) {
- BKE_reportf(reports, RPT_WARNING, "Overwrite is not checked for %s, skipping", seq->name);
- }
- }
- SEQ_CURRENT_END;
-
- if (!selected) {
- BKE_reportf(reports, RPT_WARNING, "Select movie or image strips");
- return;
- }
-
- BLI_gset_free(file_list, MEM_freeN);
-
- if (selected && !WM_jobs_is_running(wm_job)) {
- G.is_break = false;
- WM_jobs_start(CTX_wm_manager(C), wm_job);
- }
-
- ED_area_tag_redraw(area);
-}
-
-/** \} */
-
/* -------------------------------------------------------------------- */
/** \name Sequence Query Utilities
* \{ */
@@ -3160,177 +3024,6 @@ void SEQUENCER_OT_swap_data(wmOperatorType *ot)
/** \} */
-/* -------------------------------------------------------------------- */
-/** \name Rebuild Proxy and Timecode Indices Operator
- * \{ */
-
-static int sequencer_rebuild_proxy_invoke(bContext *C,
- wmOperator *op,
- const wmEvent *UNUSED(event))
-{
- seq_proxy_build_job(C, op->reports);
-
- return OPERATOR_FINISHED;
-}
-
-static int sequencer_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op))
-{
- Main *bmain = CTX_data_main(C);
- struct Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
- Scene *scene = CTX_data_scene(C);
- Editing *ed = BKE_sequencer_editing_get(scene, false);
- Sequence *seq;
- GSet *file_list;
-
- if (ed == NULL) {
- return OPERATOR_CANCELLED;
- }
-
- file_list = BLI_gset_new(BLI_ghashutil_strhash_p, BLI_ghashutil_strcmp, "file list");
-
- SEQ_CURRENT_BEGIN (ed, seq) {
- if ((seq->flag & SELECT)) {
- ListBase queue = {NULL, NULL};
- LinkData *link;
- short stop = 0, do_update;
- float progress;
-
- SEQ_proxy_rebuild_context(bmain, depsgraph, scene, seq, file_list, &queue);
-
- for (link = queue.first; link; link = link->next) {
- struct SeqIndexBuildContext *context = link->data;
- SEQ_proxy_rebuild(context, &stop, &do_update, &progress);
- SEQ_proxy_rebuild_finish(context, 0);
- }
- BKE_sequencer_free_imbuf(scene, &ed->seqbase, false);
- }
- }
- SEQ_CURRENT_END;
-
- BLI_gset_free(file_list, MEM_freeN);
-
- return OPERATOR_FINISHED;
-}
-
-void SEQUENCER_OT_rebuild_proxy(wmOperatorType *ot)
-{
- /* Identifiers. */
- ot->name = "Rebuild Proxy and Timecode Indices";
- ot->idname = "SEQUENCER_OT_rebuild_proxy";
- ot->description = "Rebuild all selected proxies and timecode indices using the job system";
-
- /* Api callbacks. */
- ot->invoke = sequencer_rebuild_proxy_invoke;
- ot->exec = sequencer_rebuild_proxy_exec;
-
- /* Flags. */
- ot->flag = OPTYPE_REGISTER;
-}
-
-/** \} */
-
-/* -------------------------------------------------------------------- */
-/** \name Set Selected Strip Proxies Operator
- * \{ */
-
-static int sequencer_enable_proxies_invoke(bContext *C,
- wmOperator *op,
- const wmEvent *UNUSED(event))
-{
- return WM_operator_props_dialog_popup(C, op, 200);
-}
-
-static int sequencer_enable_proxies_exec(bContext *C, wmOperator *op)
-{
- Scene *scene = CTX_data_scene(C);
- Editing *ed = BKE_sequencer_editing_get(scene, false);
- Sequence *seq;
- bool proxy_25 = RNA_boolean_get(op->ptr, "proxy_25");
- bool proxy_50 = RNA_boolean_get(op->ptr, "proxy_50");
- bool proxy_75 = RNA_boolean_get(op->ptr, "proxy_75");
- bool proxy_100 = RNA_boolean_get(op->ptr, "proxy_100");
- bool overwrite = RNA_boolean_get(op->ptr, "overwrite");
- bool turnon = true;
-
- if (ed == NULL || !(proxy_25 || proxy_50 || proxy_75 || proxy_100)) {
- turnon = false;
- }
-
- SEQ_CURRENT_BEGIN (ed, seq) {
- if ((seq->flag & SELECT)) {
- if (ELEM(seq->type, SEQ_TYPE_MOVIE, SEQ_TYPE_IMAGE, SEQ_TYPE_META)) {
- SEQ_proxy_set(seq, turnon);
- if (seq->strip->proxy == NULL) {
- continue;
- }
-
- if (proxy_25) {
- seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_25;
- }
- else {
- seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_25;
- }
-
- if (proxy_50) {
- seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_50;
- }
- else {
- seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_50;
- }
-
- if (proxy_75) {
- seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_75;
- }
- else {
- seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_75;
- }
-
- if (proxy_100) {
- seq->strip->proxy->build_size_flags |= SEQ_PROXY_IMAGE_SIZE_100;
- }
- else {
- seq->strip->proxy->build_size_flags &= ~SEQ_PROXY_IMAGE_SIZE_100;
- }
-
- if (!overwrite) {
- seq->strip->proxy->build_flags |= SEQ_PROXY_SKIP_EXISTING;
- }
- else {
- seq->strip->proxy->build_flags &= ~SEQ_PROXY_SKIP_EXISTING;
- }
- }
- }
- }
- SEQ_CURRENT_END;
-
- WM_event_add_notifier(C, NC_SCENE | ND_SEQUENCER, scene);
-
- return OPERATOR_FINISHED;
-}
-
-void SEQUENCER_OT_enable_proxies(wmOperatorType *ot)
-{
- /* Identifiers. */
- ot->name = "Set Selected Strip Proxies";
- ot->idname = "SEQUENCER_OT_enable_proxies";
- ot->description = "Enable selected proxies on all selected Movie, Image and Meta strips";
-
- /* Api callbacks. */
- ot->invoke = sequencer_enable_proxies_invoke;
- ot->exec = sequencer_enable_proxies_exec;
-
- /* Flags. */
- ot->flag = OPTYPE_REGISTER;
-
- RNA_def_boolean(ot->srna, "proxy_25", false, "25%", "");
- RNA_def_boolean(ot->srna, "proxy_50", false, "50%", "");
- RNA_def_boolean(ot->srna, "proxy_75", false, "75%", "");
- RNA_def_boolean(ot->srna, "proxy_100", false, "100%", "");
- RNA_def_boolean(ot->srna, "overwrite", false, "Overwrite", "");
-}
-
-/** \} */
-
/* -------------------------------------------------------------------- */
/** \name Change Effect Input Operator
* \{ */
diff --git a/source/blender/editors/space_sequencer/sequencer_proxy.c b/source/blender/editors/space_sequencer/sequencer_proxy.c
new file mode
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list