projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework deglitch/optimize/stop_playback, sams ladspa icons, reticle color, tweak frame...
[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 0c8e1b7fdec53176caf4bb0f0288f17ecf4f15e3..5019c86bd62769d96f65b4c6eae1134261d461d2 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vmodule.C
+++ b/
cinelerra-5.1/cinelerra/vmodule.C
@@
-293,7
+293,7
@@
int VModule::import_frame(VFrame *output, VEdit *current_edit,
}
else
{
}
else
{
- max_position = Units::to_int64(nested_edl->tracks->total_
playable_
length() *
+ max_position = Units::to_int64(nested_edl->tracks->total_length() *
frame_rate - 1);
}
frame_rate - 1);
}
@@
-478,12
+478,9
@@
int VModule::import_frame(VFrame *output, VEdit *current_edit,
if(!(*input))
{
if(!(*input))
{
- (*input) = new VFrame(0,
- -1,
- asset_w,
- asset_h,
- get_edl()->session->color_model,
- -1);
+ (*input) =
+ new VFrame(asset_w, asset_h,
+ get_edl()->session->color_model);
}
}
@@
-989,12
+986,9
@@
int VModule::render(VFrame *output,
// Load incoming frame
if(!(*transition_input))
{
// Load incoming frame
if(!(*transition_input))
{
- (*transition_input) = new VFrame(0,
- -1,
- track->track_w,
- track->track_h,
- get_edl()->session->color_model,
- -1);
+ (*transition_input) =
+ new VFrame(track->track_w, track->track_h,
+ get_edl()->session->color_model);
}
(*transition_input)->copy_stacks(output);
}
(*transition_input)->copy_stacks(output);