merge hv v6, rework trace methods

[goodguy/history.git] / cinelerra-5.1 / cinelerra / brender.C

diff --git a/cinelerra-5.1/cinelerra/brender.C b/cinelerra-5.1/cinelerra/brender.C
index 94a569a7faaf8bf7bbbe6dd545ecf319ad36574c..00888c9fe06420155430aef4b4cf6723ffd6c90f 100644 (file)
--- a/cinelerra-5.1/cinelerra/brender.C
+++ b/cinelerra-5.1/cinelerra/brender.C
@@ -49,7 +49,7 @@
 
 extern "C"
 {
-#include <uuid/uuid.h>
+#include <uuid.h>
 }
 
 
@@ -93,9 +93,9 @@ TRACE("BRender::~BRender 5\n");
        {
                kill(master_pid, SIGKILL);
 TRACE("BRender::~BRender 6\n");
-               Thread::join();
 TRACE("BRender::~BRender 7\n");
        }
+       Thread::join();
 
 TRACE("BRender::~BRender 8\n");
        delete map_lock;
@@ -569,7 +569,9 @@ void BRenderThread::start()
                if(last_good < 0) last_good = last_contiguous;
                int start_frame = MIN(last_contiguous, last_good);
                start_frame = MAX(start_frame, brender_start);
-               int64_t end_frame = Units::round(command->edl->tracks->total_video_length() *
+//             int64_t end_frame = Units::round(command->edl->tracks->total_video_length() * 
+//                     command->edl->session->frame_rate);
+               int64_t end_frame = Units::round(command->edl->session->brender_end *
                        command->edl->session->frame_rate);
                if(end_frame < start_frame) end_frame = start_frame;