convert all demos to find_data()

src/demo/demo.c

@@ -290,12 +290,16 @@ int main(int argc, char** argv){
       break;
     }
     char totalbuf[BPREFIXSTRLEN + 1];
-    bprefix(results[i].stats.render_bytes, 1, totalbuf, 0),
-    printf("%2zu|%c|%2lu.%03lus|%4lu|%*sB|\n", i, results[i].selector,
+    bprefix(results[i].stats.render_bytes, 1, totalbuf, 0);
+    double avg = results[i].stats.render_ns / (double)results[i].stats.renders;
+    printf("%2zu|%c|%2lu.%03lus|%4luf|%*sB|%8juµs|%.1f FPS|\n", i,
+           results[i].selector,
            results[i].timens / GIG,
            (results[i].timens % GIG) / 1000000,
            results[i].stats.renders,
-           BPREFIXSTRLEN, totalbuf);
+           BPREFIXSTRLEN, totalbuf,
+           results[i].stats.render_ns / 1000,
+           GIG / avg);
     // FIXME
   }
   free(results);

src/demo/luigi.c

@@ -147,7 +147,9 @@ draw_luigi(struct ncplane* n, const char* sprite){
 int luigi_demo(struct notcurses* nc){
   struct ncplane* n = notcurses_stdplane(nc);
   int averr = 0;
-  struct ncvisual* nv = ncplane_visual_open(n, "../tests/megaman2.bmp", &averr);
+  char* map = find_data("megaman2.bmp");
+  struct ncvisual* nv = ncplane_visual_open(n, map, &averr);
+  free(map);
   if(nv == NULL){
     return -1;
   }

src/demo/view.c

@@ -22,10 +22,13 @@ view_video_demo(struct notcurses* nc){
   ncplane_dim_yx(ncp, &dimy, &dimx);
   int averr;
   struct ncvisual* ncv;
-  ncv = ncplane_visual_open(ncp, "../tests/fm6.mkv", &averr);
+  char* fm6 = find_data("fm6.mkv");
+  ncv = ncplane_visual_open(ncp, fm6, &averr);
   if(!ncv){
+    free(fm6);
     return -1;
   }
+  free(fm6);
   if(ncvisual_stream(nc, ncv, &averr, watch_for_keystroke) < 0){
     ncvisual_destroy(ncv);
     return -1;
@@ -66,15 +69,21 @@ int view_demo(struct notcurses* nc){
   int dimy, dimx;
   ncplane_dim_yx(ncp, &dimy, &dimx);
   int averr = 0;
-  struct ncvisual* ncv = ncplane_visual_open(ncp, "../tests/PurpleDrank.jpg", &averr);
+  char* pic = find_data("PurpleDrank.jpg");
+  struct ncvisual* ncv = ncplane_visual_open(ncp, pic, &averr);
   if(ncv == NULL){
+    free(pic);
     return -1;
   }
-  struct ncvisual* ncv2 = ncplane_visual_open(ncp, "../tests/dsscaw-purp.png", &averr);
+  free(pic);
+  pic = find_data("dsscaw-purp.png");
+  struct ncvisual* ncv2 = ncplane_visual_open(ncp, pic, &averr);
   if(ncv2 == NULL){
+    free(pic);
     ncvisual_destroy(ncv);
     return -1;
   }
+  free(pic);
   if(ncvisual_decode(ncv, &averr) == NULL){
     ncvisual_destroy(ncv);
     ncvisual_destroy(ncv2);