Archives/notcurses
2
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses.git synced 2024-10-31 15:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

demo: purge use_oiio/use_nomm

Browse Source
This commit is contained in:
nick black 2020-06-01 06:21:38 -04:00
parent ec1af2d090
commit 343b4d144e
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
2 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/demo/demo.c
View File

@ -72,35 +72,33 @@ static struct {
const char* name;
int (*fxn)(struct notcurses*);
bool dfsg_disabled; // disabled for DFSG builds
bool oiio_disabled; // disabled for OIIO builds (implies mmeng_disabled)
bool mmeng_disabled; // disabled for non-multimedia builds
} demos[26] = {
{ NULL, NULL, false, false, false, },
{ "box", box_demo, false, false, false, },
{"chunli", chunli_demo, true, false, true, },
{ NULL, NULL, false, false, false, },
{ "eagle", eagle_demo, true, false, false, },
{ "fallin'", fallin_demo, false, false, false, },
{ "grid", grid_demo, false, false, false, },
{ "highcon", highcontrast_demo, false, false, false, },
{ "intro", intro, false, false, false, },
{ "jungle", jungle_demo, true, false, false, },
{ NULL, NULL, false, false, false, },
{ "luigi", luigi_demo, true, false, true, },
{ NULL, NULL, false, false, false, },
{ "normal", normal_demo, false, false, false, },
{ "outro", outro, false, false, false, },
{ NULL, NULL, false, false, false, },
{ "qrcode", qrcode_demo, false, false, false, }, // is blank without USE_QRCODEGEN
{ "reel", reel_demo, false, false, false, },
{ "sliders", sliding_puzzle_demo, false, false, false, },
{ "trans", trans_demo, false, false, false, },
{ "uniblock", unicodeblocks_demo, false, false, false, },
{ "view", view_demo, true, true, true, },
{ "whiteout", witherworm_demo, false, false, false, },
{"xray", xray_demo, false, true, true, },
{ NULL, NULL, false, false, false, },
{ NULL, NULL, false, false, false, },
{ NULL, NULL, false, },
{ "box", box_demo, false, },
{"chunli", chunli_demo, true, },
{ NULL, NULL, false, },
{ "eagle", eagle_demo, true, },
{ "fallin'", fallin_demo, false, },
{ "grid", grid_demo, false, },
{ "highcon", highcontrast_demo, false, },
{ "intro", intro, false, },
{ "jungle", jungle_demo, true, },
{ NULL, NULL, false, },
{ "luigi", luigi_demo, true, },
{ NULL, NULL, false, },
{ "normal", normal_demo, false, },
{ "outro", outro, false, },
{ NULL, NULL, false, },
{ "qrcode", qrcode_demo, false, }, // is blank without USE_QRCODEGEN
{ "reel", reel_demo, false, },
{ "sliders", sliding_puzzle_demo, false, },
{ "trans", trans_demo, false, },
{ "uniblock", unicodeblocks_demo, false, },
{ "view", view_demo, true, },
{ "whiteout", witherworm_demo, false, },
{"xray", xray_demo, false, },
{ NULL, NULL, false, },
{ NULL, NULL, false, },
};
static void
@ -151,16 +149,6 @@ ext_demos(struct notcurses* nc, const char* spec, bool ignore_failures){
if(demos[idx].dfsg_disabled){
continue;
}
#endif
#ifdef USE_OIIO
if(demos[idx].oiio_disabled){
continue;
}
#endif
#ifndef USE_MULTIMEDIA
if(demos[idx].mmeng_disabled){
continue;
}
#endif
hud_schedule(demos[idx].name);
ret = demos[idx].fxn(nc);

4
src/demo/hud.c
View File

@ -452,7 +452,7 @@ demo_nanosleep_abstime_ns(struct notcurses* nc, uint64_t deadline){
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
do{
while(deadline > timespec_to_ns(&now)){
fsleep.tv_sec = 0;
fsleep.tv_nsec = GIG / 10;
if(deadline - timespec_to_ns(&now) < GIG / 10){
@ -472,7 +472,7 @@ demo_nanosleep_abstime_ns(struct notcurses* nc, uint64_t deadline){
}
}
clock_gettime(CLOCK_MONOTONIC, &now);
}while(deadline > timespec_to_ns(&now));
}
return 0;
}