From 2bc791437e3b8e42c1369daf15c72934474b1e73 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 25 Mar 2020 17:58:58 +1100 Subject: Cleanup: use 'r_' prefix for output arguments Also pass some args as 'const'. --- source/blender/editors/space_clip/clip_intern.h | 2 +- source/blender/editors/space_clip/clip_ops.c | 8 ++--- source/blender/editors/space_clip/space_clip.c | 2 +- source/blender/editors/space_clip/tracking_ops.c | 14 ++++---- .../editors/space_clip/tracking_ops_plane.c | 6 ++-- .../editors/space_clip/tracking_ops_track.c | 4 +-- .../blender/editors/space_clip/tracking_select.c | 38 +++++++++++++--------- 7 files changed, 41 insertions(+), 33 deletions(-) (limited to 'source/blender/editors/space_clip') diff --git a/source/blender/editors/space_clip/clip_intern.h b/source/blender/editors/space_clip/clip_intern.h index b66f7605f41..4dc8d367f2b 100644 --- a/source/blender/editors/space_clip/clip_intern.h +++ b/source/blender/editors/space_clip/clip_intern.h @@ -178,7 +178,7 @@ void clip_draw_sfra_efra(struct View2D *v2d, struct Scene *scene); /* tracking_ops.c */ struct MovieTrackingTrack *tracking_marker_check_slide( - struct bContext *C, const struct wmEvent *event, int *area_r, int *action_r, int *corner_r); + struct bContext *C, const struct wmEvent *event, int *r_area, int *r_action, int *r_corner); void CLIP_OT_add_marker(struct wmOperatorType *ot); void CLIP_OT_add_marker_at_click(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index efc8c3bb7dd..4e5c6513695 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -1315,8 +1315,8 @@ typedef struct ProxyThread { static unsigned char *proxy_thread_next_frame(ProxyQueue *queue, MovieClip *clip, - size_t *size_r, - int *cfra_r) + size_t *r_size, + int *r_cfra) { unsigned char *mem = NULL; @@ -1353,8 +1353,8 @@ static unsigned char *proxy_thread_next_frame(ProxyQueue *queue, return NULL; } - *size_r = size; - *cfra_r = queue->cfra; + *r_size = size; + *r_cfra = queue->cfra; queue->cfra++; close(file); diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c index a273487eee9..4b9c872ffce 100644 --- a/source/blender/editors/space_clip/space_clip.c +++ b/source/blender/editors/space_clip/space_clip.c @@ -605,7 +605,7 @@ static int clip_context(const bContext *C, const char *member, bContextDataResul static bool clip_drop_poll(bContext *UNUSED(C), wmDrag *drag, const wmEvent *UNUSED(event), - const char **UNUSED(tooltip)) + const char **UNUSED(r_tooltip)) { if (drag->type == WM_DRAG_PATH) { /* rule might not work? */ diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index f88f6113b54..739701b5595 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -544,7 +544,7 @@ static bool slide_check_corners(float (*corners)[2]) } MovieTrackingTrack *tracking_marker_check_slide( - bContext *C, const wmEvent *event, int *area_r, int *action_r, int *corner_r) + bContext *C, const wmEvent *event, int *r_area, int *r_action, int *r_corner) { const float distance_clip_squared = 12.0f * 12.0f; SpaceClip *sc = CTX_wm_space_clip(C); @@ -657,14 +657,14 @@ MovieTrackingTrack *tracking_marker_check_slide( } if (global_min_distance_squared < distance_clip_squared / sc->zoom) { - if (area_r) { - *area_r = min_area; + if (r_area) { + *r_area = min_area; } - if (action_r) { - *action_r = min_action; + if (r_action) { + *r_action = min_action; } - if (corner_r) { - *corner_r = min_corner; + if (r_corner) { + *r_corner = min_corner; } return min_track; } diff --git a/source/blender/editors/space_clip/tracking_ops_plane.c b/source/blender/editors/space_clip/tracking_ops_plane.c index 0cf0e85929c..3c5646911a3 100644 --- a/source/blender/editors/space_clip/tracking_ops_plane.c +++ b/source/blender/editors/space_clip/tracking_ops_plane.c @@ -122,7 +122,7 @@ static float mouse_to_plane_slide_zone_distance_squared(const float co[2], static MovieTrackingPlaneTrack *tracking_plane_marker_check_slide(bContext *C, const wmEvent *event, - int *corner_r) + int *r_corner) { const float distance_clip_squared = 12.0f * 12.0f; SpaceClip *sc = CTX_wm_space_clip(C); @@ -162,8 +162,8 @@ static MovieTrackingPlaneTrack *tracking_plane_marker_check_slide(bContext *C, } if (min_distance_squared < distance_clip_squared / sc->zoom) { - if (corner_r != NULL) { - *corner_r = min_corner; + if (r_corner != NULL) { + *r_corner = min_corner; } return min_plane_track; } diff --git a/source/blender/editors/space_clip/tracking_ops_track.c b/source/blender/editors/space_clip/tracking_ops_track.c index c14895f8483..05623347366 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.c +++ b/source/blender/editors/space_clip/tracking_ops_track.c @@ -86,7 +86,7 @@ static int track_count_markers(SpaceClip *sc, MovieClip *clip, int framenr) return tot; } -static void track_init_markers(SpaceClip *sc, MovieClip *clip, int framenr, int *frames_limit_r) +static void track_init_markers(SpaceClip *sc, MovieClip *clip, int framenr, int *r_frames_limit) { ListBase *tracksbase = BKE_tracking_get_active_tracks(&clip->tracking); int frames_limit = 0; @@ -109,7 +109,7 @@ static void track_init_markers(SpaceClip *sc, MovieClip *clip, int framenr, int } } } - *frames_limit_r = frames_limit; + *r_frames_limit = frames_limit; } static bool track_markers_check_direction(int backwards, int curfra, int efra) diff --git a/source/blender/editors/space_clip/tracking_select.c b/source/blender/editors/space_clip/tracking_select.c index 2166cff4883..67c453825f7 100644 --- a/source/blender/editors/space_clip/tracking_select.c +++ b/source/blender/editors/space_clip/tracking_select.c @@ -52,7 +52,7 @@ #include "clip_intern.h" /* own include */ #include "tracking_ops_intern.h" /* own include */ -static float dist_to_crns(float co[2], float pos[2], float crns[4][2]); +static float dist_to_crns(const float co[2], const float pos[2], const float crns[4][2]); /********************** mouse select operator *********************/ @@ -70,8 +70,12 @@ static int mouse_on_side( return (co[0] >= x1 - epsx && co[0] <= x2 + epsx) && (co[1] >= y1 - epsy && co[1] <= y2 + epsy); } -static int mouse_on_rect( - const float co[2], float pos[2], float min[2], float max[2], float epsx, float epsy) +static int mouse_on_rect(const float co[2], + const float pos[2], + const float min[2], + const float max[2], + float epsx, + float epsy) { return mouse_on_side( co, pos[0] + min[0], pos[1] + min[1], pos[0] + max[0], pos[1] + min[1], epsx, epsy) || @@ -83,14 +87,15 @@ static int mouse_on_rect( co, pos[0] + max[0], pos[1] + min[1], pos[0] + max[0], pos[1] + max[1], epsx, epsy); } -static int mouse_on_crns(float co[2], float pos[2], float crns[4][2], float epsx, float epsy) +static int mouse_on_crns( + const float co[2], const float pos[2], const float crns[4][2], float epsx, float epsy) { float dist = dist_to_crns(co, pos, crns); return dist < max_ff(epsx, epsy); } -static int track_mouse_area(const bContext *C, float co[2], MovieTrackingTrack *track) +static int track_mouse_area(const bContext *C, const float co[2], MovieTrackingTrack *track) { SpaceClip *sc = CTX_wm_space_clip(C); int framenr = ED_space_clip_get_clip_frame_number(sc); @@ -142,7 +147,10 @@ static int track_mouse_area(const bContext *C, float co[2], MovieTrackingTrack * return TRACK_AREA_NONE; } -static float dist_to_rect(float co[2], float pos[2], float min[2], float max[2]) +static float dist_to_rect(const float co[2], + const float pos[2], + const float min[2], + const float max[2]) { float d1, d2, d3, d4; float p[2] = {co[0] - pos[0], co[1] - pos[1]}; @@ -158,7 +166,7 @@ static float dist_to_rect(float co[2], float pos[2], float min[2], float max[2]) } /* Distance to quad defined by it's corners, corners are relative to pos */ -static float dist_to_crns(float co[2], float pos[2], float crns[4][2]) +static float dist_to_crns(const float co[2], const float pos[2], const float crns[4][2]) { float d1, d2, d3, d4; float p[2] = {co[0] - pos[0], co[1] - pos[1]}; @@ -174,7 +182,7 @@ static float dist_to_crns(float co[2], float pos[2], float crns[4][2]) } /* Same as above, but all the coordinates are absolute */ -static float dist_to_crns_abs(float co[2], float corners[4][2]) +static float dist_to_crns_abs(const float co[2], const float corners[4][2]) { float d1, d2, d3, d4; const float *v1 = corners[0], *v2 = corners[1]; @@ -190,8 +198,8 @@ static float dist_to_crns_abs(float co[2], float corners[4][2]) static MovieTrackingTrack *find_nearest_track(SpaceClip *sc, ListBase *tracksbase, - float co[2], - float *distance_r) + const float co[2], + float *r_distance) { MovieTrackingTrack *track = NULL, *cur; float mindist = 0.0f; @@ -231,15 +239,15 @@ static MovieTrackingTrack *find_nearest_track(SpaceClip *sc, cur = cur->next; } - *distance_r = mindist; + *r_distance = mindist; return track; } static MovieTrackingPlaneTrack *find_nearest_plane_track(SpaceClip *sc, ListBase *plane_tracks_base, - float co[2], - float *distance_r) + const float co[2], + float *r_distance) { MovieTrackingPlaneTrack *plane_track = NULL, *current_plane_track; float min_distance = 0.0f; @@ -259,7 +267,7 @@ static MovieTrackingPlaneTrack *find_nearest_plane_track(SpaceClip *sc, } } - *distance_r = min_distance; + *r_distance = min_distance; return plane_track; } @@ -281,7 +289,7 @@ void ed_tracking_deselect_all_plane_tracks(ListBase *plane_tracks_base) } } -static int mouse_select(bContext *C, float co[2], const bool extend, const bool deselect_all) +static int mouse_select(bContext *C, const float co[2], const bool extend, const bool deselect_all) { SpaceClip *sc = CTX_wm_space_clip(C); MovieClip *clip = ED_space_clip_get_clip(sc); -- cgit v1.2.3