diff --git a/src/lib/internal.h b/src/lib/internal.h index 02c33227b..244b5e2cd 100644 --- a/src/lib/internal.h +++ b/src/lib/internal.h @@ -1413,7 +1413,7 @@ int kitty_blit(ncplane* nc, int linesize, const void* data, int term_fg_rgb8(bool RGBflag, const char* setaf, int colors, FILE* out, unsigned r, unsigned g, unsigned b); -API const struct blitset* lookup_blitset(const tinfo* tcache, ncblitter_e setid, bool may_degrade); +const struct blitset* lookup_blitset(const tinfo* tcache, ncblitter_e setid, bool may_degrade); static inline int rgba_blit_dispatch(ncplane* nc, const struct blitset* bset, diff --git a/src/media/ffmpeg.c b/src/media/ffmpeg.c index c1c534544..02beff030 100644 --- a/src/media/ffmpeg.c +++ b/src/media/ffmpeg.c @@ -402,10 +402,7 @@ int ffmpeg_stream(notcurses* nc, ncvisual* ncv, float timescale, } // decay the blitter explicitly, so that the callback knows the blitter it // was actually rendered with - const struct blitset* bset = rgba_blitter(nc, &activevopts); - if(bset){ - activevopts.blitter = bset->geom; - } + ncvisual_blitter_geom(nc, ncv, &activevopts, NULL, NULL, NULL, NULL, &activevopts.blitter); if((newn = ncvisual_render(nc, ncv, &activevopts)) == NULL){ if(activevopts.n != vopts->n){ ncplane_destroy(activevopts.n); diff --git a/src/media/oiio-indep.c b/src/media/oiio-indep.c index 72f37f9d6..8334a3911 100644 --- a/src/media/oiio-indep.c +++ b/src/media/oiio-indep.c @@ -27,10 +27,7 @@ int oiio_stream(struct notcurses* nc, ncvisual* ncv, float timescale, do{ // decay the blitter explicitly, so that the callback knows the blitter it // was actually rendered with - const struct blitset* bset = rgba_blitter(nc, &activevopts); - if(bset){ - activevopts.blitter = bset->geom; - } + ncvisual_blitter_geom(nc, ncv, &activevopts, NULL, NULL, NULL, NULL, &activevopts.blitter); if((newn = ncvisual_render(nc, ncv, &activevopts)) == NULL){ if(activevopts.n != vopts->n){ ncplane_destroy(activevopts.n); diff --git a/src/player/play.cpp b/src/player/play.cpp index 7b8e1a785..71e91578a 100644 --- a/src/player/play.cpp +++ b/src/player/play.cpp @@ -160,6 +160,8 @@ auto perframe(struct ncvisual* ncv, struct ncvisual_options* vopts, notcurses_check_pixel_support(nc); } continue; + }else if(keyp >= '7' && keyp <= '9' && !ni.alt && !ni.ctrl){ + continue; // don't error out }else if(keyp == NCKey::Up){ // FIXME move backwards significantly continue; @@ -396,7 +398,8 @@ int rendered_mode_player_inner(NotCurses& nc, int argc, char** argv, nc.refresh(nullptr, nullptr); }else if(ie >= '0' && ie <= '6'){ --i; // rerun same input with the new blitter - vopts.blitter = blitter = static_cast(ie - '0'); + }else if(ie >= '7' && ie <= '9'){ + --i; // just absorb the input }else if(ie == NCKey::Resize){ --i; // rerun with the new size if(!nc.refresh(&dimy, &dimx)){