projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add olaf's neophyte update, add binfolder apply btn
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
track.C
diff --git
a/cinelerra-5.1/cinelerra/track.C
b/cinelerra-5.1/cinelerra/track.C
index 1a11c434b6f2e4e978ee0203ee0a46a275b561ca..b13e9e9d1acbc1a0859b4bf188df9ffa4b80f33d 100644
(file)
--- a/
cinelerra-5.1/cinelerra/track.C
+++ b/
cinelerra-5.1/cinelerra/track.C
@@
-1155,7
+1155,7
@@
int Track::copy_assets(double start,
int Track::blade(double position)
{
int Track::blade(double position)
{
- int64_t start = to_units(position,
1
);
+ int64_t start = to_units(position,
0
);
Edit *edit = edits->split_edit(start);
if( !edit ) return 1;
edit->hard_left = 1;
Edit *edit = edits->split_edit(start);
if( !edit ) return 1;
edit->hard_left = 1;
@@
-1856,6
+1856,13
@@
double Track::from_units(int64_t position)
return (double)position;
}
return (double)position;
}
+int64_t Track::frame_align(int64_t position, int round)
+{
+ if( data_type != TRACK_VIDEO && edl->session->cursor_on_frames )
+ position = to_units(edl->align_to_frame(from_units(position), round), round);
+ return position;
+}
+
int Track::plugin_exists(Plugin *plugin)
{
for(int number = 0; number < plugin_set.size(); number++)
int Track::plugin_exists(Plugin *plugin)
{
for(int number = 0; number < plugin_set.size(); number++)