projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
repair a/v patchgui widget placement
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
vmodule.C
diff --git
a/cinelerra-5.1/cinelerra/vmodule.C
b/cinelerra-5.1/cinelerra/vmodule.C
index 1958ef78222efb1959728f87c265e46d223ba714..3ef17f0436d714bf0aa4175ed9f6e292a3f1cf89 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vmodule.C
+++ b/
cinelerra-5.1/cinelerra/vmodule.C
@@
-223,7
+223,14
@@
int VModule::import_frame(VFrame *output, VEdit *current_edit,
}
if(debug) printf("VModule::import_frame %d\n", __LINE__);
}
if(debug) printf("VModule::import_frame %d\n", __LINE__);
- if(!output) printf("VModule::import_frame %d output=%p\n", __LINE__, output);
+ if( output ) {
+ if( use_opengl )
+ x11_device->clear_input(output);
+ else
+ output->clear_frame();
+ }
+ else
+ printf("VModule::import_frame %d output=%p\n", __LINE__, output);
if(current_edit &&
(current_edit->asset ||
if(current_edit &&
(current_edit->asset ||
@@
-871,15
+878,6
@@
current_cmodel);
else
// Source not found
{
else
// Source not found
{
- if(debug) printf("VModule::import_frame %d\n", __LINE__);
- if(use_opengl)
- {
- x11_device->clear_input(output);
- }
- else
- {
- output->clear_frame();
- }
result = 1;
}
result = 1;
}