diff options
author | Campbell Barton <campbell@blender.org> | 2022-11-04 10:37:25 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-11-05 05:47:01 +0300 |
commit | ae3073323e92a1773fb253bd1c5d6c92b826e1e0 (patch) | |
tree | 0c2c63d40bbb0b83c6604f8b4e40e8f46ab0047e /source/blender/sequencer | |
parent | 4a313b82529b95aa267086ca0c4f113e65bb79c8 (diff) |
Cleanup: use bool instead of short for job stop & do_update arguments
Since these values are only ever 0/1, use bool type.
Diffstat (limited to 'source/blender/sequencer')
-rw-r--r-- | source/blender/sequencer/SEQ_proxy.h | 4 | ||||
-rw-r--r-- | source/blender/sequencer/SEQ_render.h | 4 | ||||
-rw-r--r-- | source/blender/sequencer/intern/proxy.c | 5 | ||||
-rw-r--r-- | source/blender/sequencer/intern/proxy_job.c | 4 | ||||
-rw-r--r-- | source/blender/sequencer/intern/render.c | 4 |
5 files changed, 9 insertions, 12 deletions
diff --git a/source/blender/sequencer/SEQ_proxy.h b/source/blender/sequencer/SEQ_proxy.h index 00747f4b9cf..caf123afbcf 100644 --- a/source/blender/sequencer/SEQ_proxy.h +++ b/source/blender/sequencer/SEQ_proxy.h @@ -29,8 +29,8 @@ bool SEQ_proxy_rebuild_context(struct Main *bmain, struct ListBase *queue, bool build_only_on_bad_performance); void SEQ_proxy_rebuild(struct SeqIndexBuildContext *context, - short *stop, - short *do_update, + bool *stop, + bool *do_update, float *progress); void SEQ_proxy_rebuild_finish(struct SeqIndexBuildContext *context, bool stop); void SEQ_proxy_set(struct Sequence *seq, bool value); diff --git a/source/blender/sequencer/SEQ_render.h b/source/blender/sequencer/SEQ_render.h index f95497b32b8..e2672eef8b9 100644 --- a/source/blender/sequencer/SEQ_render.h +++ b/source/blender/sequencer/SEQ_render.h @@ -67,7 +67,7 @@ void SEQ_render_thumbnails(const struct SeqRenderData *context, struct Sequence *seq_orig, float frame_step, const struct rctf *view_area, - const short *stop); + const bool *stop); /** * Get cached thumbnails. */ @@ -103,7 +103,7 @@ void SEQ_render_thumbnails_base_set(const struct SeqRenderData *context, struct Sequence *seq, struct Sequence *seq_orig, const struct rctf *view_area, - const short *stop); + const bool *stop); void SEQ_render_init_colorspace(struct Sequence *seq); void SEQ_render_new_render_data(struct Main *bmain, diff --git a/source/blender/sequencer/intern/proxy.c b/source/blender/sequencer/intern/proxy.c index fc1df4dc3ac..eaea310f423 100644 --- a/source/blender/sequencer/intern/proxy.c +++ b/source/blender/sequencer/intern/proxy.c @@ -479,10 +479,7 @@ bool SEQ_proxy_rebuild_context(Main *bmain, return true; } -void SEQ_proxy_rebuild(SeqIndexBuildContext *context, - short *stop, - short *do_update, - float *progress) +void SEQ_proxy_rebuild(SeqIndexBuildContext *context, bool *stop, bool *do_update, float *progress) { const bool overwrite = context->overwrite; SeqRenderData render_context; diff --git a/source/blender/sequencer/intern/proxy_job.c b/source/blender/sequencer/intern/proxy_job.c index 8520c06f9a2..d7dfe0130d8 100644 --- a/source/blender/sequencer/intern/proxy_job.c +++ b/source/blender/sequencer/intern/proxy_job.c @@ -41,7 +41,7 @@ static void proxy_freejob(void *pjv) } /* Only this runs inside thread. */ -static void proxy_startjob(void *pjv, short *stop, short *do_update, float *progress) +static void proxy_startjob(void *pjv, bool *stop, bool *do_update, float *progress) { ProxyJob *pj = pjv; LinkData *link; @@ -52,7 +52,7 @@ static void proxy_startjob(void *pjv, short *stop, short *do_update, float *prog SEQ_proxy_rebuild(context, stop, do_update, progress); if (*stop) { - pj->stop = 1; + pj->stop = true; fprintf(stderr, "Canceling proxy rebuild on users request...\n"); break; } diff --git a/source/blender/sequencer/intern/render.c b/source/blender/sequencer/intern/render.c index 3cb15e092c8..5c6a59a5943 100644 --- a/source/blender/sequencer/intern/render.c +++ b/source/blender/sequencer/intern/render.c @@ -2103,7 +2103,7 @@ void SEQ_render_thumbnails(const SeqRenderData *context, Sequence *seq_orig, float frame_step, const rctf *view_area, - const short *stop) + const bool *stop) { SeqRenderState state; seq_render_state_init(&state); @@ -2164,7 +2164,7 @@ void SEQ_render_thumbnails_base_set(const SeqRenderData *context, Sequence *seq, Sequence *seq_orig, const rctf *view_area, - const short *stop) + const bool *stop) { SeqRenderState state; seq_render_state_init(&state); |