From 8bef305b6d6628d9d0cd9b8e8765108842fddc5b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 30 Jun 2015 14:47:31 +1000 Subject: Cleanup: move BLI_timestr to BLI_timecode --- source/blender/editors/animation/anim_draw.c | 2 +- source/blender/editors/interface/view2d.c | 2 +- source/blender/editors/physics/dynamicpaint_ops.c | 7 +------ source/blender/editors/render/render_internal.c | 8 +++++--- 4 files changed, 8 insertions(+), 11 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index d5945425576..498086047ad 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -86,7 +86,7 @@ static void draw_cfra_number(Scene *scene, View2D *v2d, const float cfra, const BLI_timecode_string_from_time(&numstr[4], sizeof(numstr) - 4, 0, FRA2TIME(cfra), FPS, U.timecode_style); } else { - BLI_timecode_string_from_time_simple(&numstr[4], sizeof(numstr) - 4, 1, cfra); + BLI_timecode_string_from_time_seconds(&numstr[4], sizeof(numstr) - 4, 1, cfra); } slen = UI_fontstyle_string_width(fstyle, numstr) - 1; diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 4f4b5ab07ff..5f0c3ff6993 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1663,7 +1663,7 @@ static void scroll_printstr(Scene *scene, float x, float y, float val, int power BLI_timecode_string_from_time(timecode_str, sizeof(timecode_str), power, val, FPS, U.timecode_style); } else { - BLI_timecode_string_from_time_simple(timecode_str, sizeof(timecode_str), power, val); + BLI_timecode_string_from_time_seconds(timecode_str, sizeof(timecode_str), power, val); } /* get length of string, and adjust printing location to fit it into the horizontal scrollbar */ diff --git a/source/blender/editors/physics/dynamicpaint_ops.c b/source/blender/editors/physics/dynamicpaint_ops.c index d864934171b..245d8790399 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.c +++ b/source/blender/editors/physics/dynamicpaint_ops.c @@ -396,13 +396,8 @@ static int dynamicPaint_initBake(struct bContext *C, struct wmOperator *op) /* Bake was successful: * Report for ended bake and how long it took */ if (status) { - /* Format time string */ - char time_str[30]; - double time = PIL_check_seconds_timer() - timer; - BLI_timestr(time, time_str, sizeof(time_str)); - /* Show bake info */ - BKE_reportf(op->reports, RPT_INFO, "Bake complete! (%s)", time_str); + BKE_reportf(op->reports, RPT_INFO, "Bake complete! (%.2f)", PIL_check_seconds_timer() - timer); } else { if (strlen(canvas->error)) { /* If an error occurred */ diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c index 2ba1e615a9e..bf2fcb73249 100644 --- a/source/blender/editors/render/render_internal.c +++ b/source/blender/editors/render/render_internal.c @@ -33,7 +33,9 @@ #include "MEM_guardedalloc.h" -#include "BLI_blenlib.h" +#include "BLI_listbase.h" +#include "BLI_rect.h" +#include "BLI_timecode.h" #include "BLI_math.h" #include "BLI_threads.h" #include "BLI_utildefines.h" @@ -374,7 +376,7 @@ static void make_renderinfo_string(const RenderStats *rs, spos += sprintf(spos, IFACE_("Frame:%d "), (scene->r.cfra)); /* previous and elapsed time */ - BLI_timestr(rs->lastframetime, info_time_str, sizeof(info_time_str)); + BLI_timecode_string_from_time_simple(info_time_str, sizeof(info_time_str), rs->lastframetime); if (rs->infostr && rs->infostr[0]) { if (rs->lastframetime != 0.0) @@ -382,7 +384,7 @@ static void make_renderinfo_string(const RenderStats *rs, else spos += sprintf(spos, "| "); - BLI_timestr(PIL_check_seconds_timer() - rs->starttime, info_time_str, sizeof(info_time_str)); + BLI_timecode_string_from_time_simple(info_time_str, sizeof(info_time_str), PIL_check_seconds_timer() - rs->starttime); } else spos += sprintf(spos, "| "); -- cgit v1.2.3