From c286a8ae9b6829b28401aa8d681248ff8bd201bd Mon Sep 17 00:00:00 2001 From: nick black Date: Tue, 16 Jun 2020 12:02:23 -0400 Subject: [PATCH] ncvisual_stream(): fix oiio for eager decode #721 --- src/lib/oiio.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/oiio.cpp b/src/lib/oiio.cpp index 0ea74e389..c13d7dc62 100644 --- a/src/lib/oiio.cpp +++ b/src/lib/oiio.cpp @@ -146,7 +146,7 @@ auto ncvisual_stream(notcurses* nc, ncvisual* ncv, nc_err_e* ncerr, float timesc ncplane* newn = nullptr; ncvisual_options activevopts; memcpy(&activevopts, vopts, sizeof(*vopts)); - while((*ncerr = ncvisual_decode(ncv)) == NCERR_SUCCESS){ + do{ if((newn = ncvisual_render(nc, ncv, &activevopts)) == NULL){ if(activevopts.n != vopts->n){ ncplane_destroy(activevopts.n); @@ -163,6 +163,8 @@ auto ncvisual_stream(notcurses* nc, ncvisual* ncv, nc_err_e* ncerr, float timesc int r; if(streamer){ r = streamer(ncv, &activevopts, &now, curry); + }else{ + r = ncvisual_simple_streamer(ncv, &activevopts, &now, curry); } if(r){ if(activevopts.n != vopts->n){ @@ -171,7 +173,7 @@ auto ncvisual_stream(notcurses* nc, ncvisual* ncv, nc_err_e* ncerr, float timesc return r; } ++frame; - } + }while((*ncerr = ncvisual_decode(ncv)) == NCERR_SUCCESS); if(activevopts.n != vopts->n){ ncplane_destroy(activevopts.n); }