From a0d7d7399010feada23257e8165b74c3400aedfc Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Sun, 12 Nov 2017 15:38:38 +0100 Subject: move some printing from stderr to stdout (ref #320) --- modules/auloop/auloop.c | 6 ++++-- modules/menu/menu.c | 6 ++++-- modules/vidloop/vidloop.c | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/auloop/auloop.c b/modules/auloop/auloop.c index 5573621..8324a88 100644 --- a/modules/auloop/auloop.c +++ b/modules/auloop/auloop.c @@ -91,13 +91,15 @@ static void print_stats(struct audio_loop *al) if (al->n_write) rw_ratio = 1.0 * al->n_read / al->n_write; - (void)re_fprintf(stderr, "\r%uHz %dch %s " + (void)re_fprintf(stdout, "\r%uHz %dch %s " " n_read=%u n_write=%u rw_ratio=%.2f", al->srate, al->ch, aufmt_name(al->fmt), al->n_read, al->n_write, rw_ratio); if (str_isset(aucodec)) - (void)re_fprintf(stderr, " codec='%s'", aucodec); + (void)re_fprintf(stdout, " codec='%s'", aucodec); + + fflush(stdout); } diff --git a/modules/menu/menu.c b/modules/menu/menu.c index 23aae45..4e36e54 100644 --- a/modules/menu/menu.c +++ b/modules/menu/menu.c @@ -376,6 +376,8 @@ static int create_ua(struct re_printf *pf, void *arg) static int cmd_ua_next(struct re_printf *pf, void *unused) { + int err; + (void)pf; (void)unused; @@ -386,13 +388,13 @@ static int cmd_ua_next(struct re_printf *pf, void *unused) le_cur = le_cur->next ? le_cur->next : list_head(uag_list()); - (void)re_fprintf(stderr, "ua: %s\n", ua_aor(list_ledata(le_cur))); + err = re_hprintf(pf, "ua: %s\n", ua_aor(list_ledata(le_cur))); uag_current_set(list_ledata(le_cur)); update_callstatus(); - return 0; + return err; } diff --git a/modules/vidloop/vidloop.c b/modules/vidloop/vidloop.c index 52f4359..d99fa49 100644 --- a/modules/vidloop/vidloop.c +++ b/modules/vidloop/vidloop.c @@ -285,7 +285,7 @@ static int enable_codec(struct video_loop *vl, const char *name) static void print_status(struct video_loop *vl) { - (void)re_fprintf(stderr, + (void)re_fprintf(stdout, "\rstatus:" " [%s] [%s] intra=%zu " " EFPS=%.1f %u kbit/s \r", @@ -293,6 +293,7 @@ static void print_status(struct video_loop *vl) vl->vc_dec ? vl->vc_dec->name : "", vl->stat.n_intra, vl->stat.efps, vl->stat.bitrate); + fflush(stdout); } -- cgit v1.2.3