projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
back out dav1d 0.6.0->0.5.1 nasm incompatible most systems, upgrade openexr to 2...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
vrender.C
diff --git
a/cinelerra-5.1/cinelerra/vrender.C
b/cinelerra-5.1/cinelerra/vrender.C
index 42f83ef87e7d86e57a2c84a8bf7b4781fad41984..3aa1b24df22bf29f651b96235a9544f7cdf78af1 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vrender.C
+++ b/
cinelerra-5.1/cinelerra/vrender.C
@@
-61,7
+61,7
@@
VRender::VRender(RenderEngine *renderengine)
{
data_type = TRACK_VIDEO;
transition_temp = 0;
{
data_type = TRACK_VIDEO;
transition_temp = 0;
- overlayer = new OverlayFrame(renderengine->preferences->pro
cessors
);
+ overlayer = new OverlayFrame(renderengine->preferences->pro
ject_smp
);
input_temp = 0;
vmodule_render_fragment = 0;
playback_buffer = 0;
input_temp = 0;
vmodule_render_fragment = 0;
playback_buffer = 0;
@@
-74,9
+74,10
@@
VRender::VRender(RenderEngine *renderengine)
VRender::~VRender()
{
VRender::~VRender()
{
- if(input_temp) delete input_temp;
- if(transition_temp) delete transition_temp;
- if(overlayer) delete overlayer;
+ renderengine->wait_done();
+ delete overlayer;
+ delete input_temp;
+ delete transition_temp;
}
}
@@
-481,8
+482,9
@@
void VRender::run()
framerate_timer.update();
}
if(debug) printf("VRender::run %d done=%d\n", __LINE__, done);
framerate_timer.update();
}
if(debug) printf("VRender::run %d done=%d\n", __LINE__, done);
- if( !interrupt )
- interrupt = renderengine->video->interrupt;
+ if( !interrupt ) interrupt = renderengine->interrupted;
+ if( !interrupt ) interrupt = renderengine->video->interrupt;
+ if( !interrupt ) interrupt = vconsole->interrupt;
}
}