Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-11-20 03:25:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

respect default mode in fadein #40

Browse Source
This commit is contained in:
nick black 2019-12-02 03:39:30 -05:00 committed by Nick Black
parent 0e4080456c
commit 94e52d4acc
1 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/notcurses.c
View File

@ -1684,15 +1684,19 @@ int ncplane_fadein(ncplane* n, const struct timespec* ts){
cell_rgb_get_fg(pp.channels[p], &r, &g, &b);
unsigned br, bg, bb;
cell_rgb_get_bg(pp.channels[p], &br, &bg, &bb);
if(!cell_fg_default_p(c)){
r = r * iter / maxsteps;
g = g * iter / maxsteps;
b = b * iter / maxsteps;
cell_set_fg(c, r, g, b);
}
if(!cell_bg_default_p(c)){
br = br * iter / maxsteps;
bg = bg * iter / maxsteps;
bb = bb * iter / maxsteps;
cell_set_bg(c, br, bg, bb);
}
}
notcurses_render(n->nc);
uint64_t nextwake = (iter + 1) * nanosecs_step + startns;
struct timespec sleepspec;
@ -1768,3 +1772,33 @@ int ncplane_fadeout(ncplane* n, const struct timespec* ts){
free(pp.channels);
return 0;
}
int ncvisual_stream(notcurses* nc, ncvisual* ncv, int* averr){
ncplane* n = ncv->ncp;
int frame = 1;
AVFrame* avf;
struct timespec start;
// FIXME should keep a start time and cumulative time; this will push things
// out on a loaded machine
while(clock_gettime(CLOCK_MONOTONIC, &start),
(avf = ncvisual_decode(ncv, averr)) ){
ncplane_cursor_move_yx(n, 0, 0);
if(ncvisual_render(ncv)){
return -1;
}
if(notcurses_render(nc)){
return -1;
}
++frame;
uint64_t ns = avf->pkt_duration * 1000000;
struct timespec interval = {
.tv_sec = start.tv_sec + (long)(ns / 1000000000),
.tv_nsec = start.tv_nsec + (long)(ns % 1000000000),
};
clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &interval, NULL);
}
if(*averr == AVERROR_EOF){
return 0;
}
return -1;
}