projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add refresh rate to vicons + a bunch of bug fixes
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
awindowgui.C
diff --git
a/cinelerra-5.0/cinelerra/awindowgui.C
b/cinelerra-5.0/cinelerra/awindowgui.C
index f340bb0e207f92b6b0bdbf2de80ee7a07af74293..3e351957ae83b13d87fe3fd29feb8c72b8d8a3f1 100644
(file)
--- a/
cinelerra-5.0/cinelerra/awindowgui.C
+++ b/
cinelerra-5.0/cinelerra/awindowgui.C
@@
-91,7
+91,8
@@
VFrame *AssetVIcon::frame()
if( !temp )
temp = new VFrame(asset->width, asset->height, BC_RGB888);
file->set_layer(0);
if( !temp )
temp = new VFrame(asset->width, asset->height, BC_RGB888);
file->set_layer(0);
- file->set_video_position(images.size(),0);
+ int64_t pos = seq_no / picon->gui->vicon_thread->refresh_rate * frame_rate;
+ file->set_video_position(pos,0);
int ww = picon->gui->vicon_thread->view_w;
int hh = picon->gui->vicon_thread->view_h;
while( seq_no >= images.size() ) {
int ww = picon->gui->vicon_thread->view_w;
int hh = picon->gui->vicon_thread->view_h;
while( seq_no >= images.size() ) {
@@
-103,11
+104,10
@@
VFrame *AssetVIcon::frame()
return *images[seq_no];
}
return *images[seq_no];
}
-int64_t AssetVIcon::
next_frame(int n
)
+int64_t AssetVIcon::
set_seq_no(int64_t no
)
{
{
- age += n * period;
- if( (seq_no+=n) >= length ) seq_no = 0;
- return seq_no;
+ if( no >= length ) no = 0;
+ return seq_no = no;
}
int AssetVIcon::get_vx()
}
int AssetVIcon::get_vx()