From 2c7034f1e368b32f6c9b18b1c84599374e7897f6 Mon Sep 17 00:00:00 2001
From: nick black <dankamongmen@gmail.com>
Date: Fri, 16 Apr 2021 01:46:17 -0400
Subject: [PATCH] [ncplayer] fix margins in direct mode #1515

---
 src/lib/direct.c    |  1 +
 src/player/play.cpp | 16 +++++-----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/lib/direct.c b/src/lib/direct.c
index 4ce4c7421..27c9b1a1f 100644
--- a/src/lib/direct.c
+++ b/src/lib/direct.c
@@ -1148,5 +1148,6 @@ int ncdirect_stream(ncdirect* n, const char* filename, ncstreamcb streamer,
     streamer(ncv, vopts, NULL, curry);
   }while(ncvisual_decode(ncv) == 0);
   ncvisual_destroy(ncv);
+  // FIXME needn't we free v also?
   return 0;
 }
diff --git a/src/player/play.cpp b/src/player/play.cpp
index ab54daa6e..845853c5a 100644
--- a/src/player/play.cpp
+++ b/src/player/play.cpp
@@ -324,12 +324,6 @@ int direct_mode_player(int argc, char** argv, ncscale_e scalemode,
   }
   dm.cursor_disable();
   for(auto i = 0 ; i < argc ; ++i){
-    auto faken = dm.prep_image(argv[i], blitter, scalemode, -1,
-                               dm.get_dim_x() - (lmargin + rmargin));
-    if(!faken){
-      failed = true;
-      break;
-    }
     // FIXME need to free faken
     // FIXME we want to honor the different left and right margins, but that
     // would require raster_image() knowing how far over we were starting for
@@ -341,11 +335,6 @@ int direct_mode_player(int argc, char** argv, ncscale_e scalemode,
     }else{
       a = NCAlign::Center;
     }
-    int y, x;
-    dm.get_cursor_yx(&y, &x);
-    if(x){
-      std::cout << std::endl;
-    }
     struct ncvisual_options vopts{};
     vopts.blitter = blitter;
     vopts.scaling = scalemode;
@@ -354,6 +343,11 @@ int direct_mode_player(int argc, char** argv, ncscale_e scalemode,
     if(dm.streamfile(argv[i], perframe_direct, &vopts, NULL)){
       failed = true;
     }
+    int y, x;
+    dm.get_cursor_yx(&y, &x);
+    if(x){
+      std::cout << std::endl;
+    }
   }
   dm.cursor_enable();
   return failed ? -1 : 0;