projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework ffmpeg a/v filter setup, rework ffmpeg hw decode with vid filters, rework...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
tracking.C
diff --git
a/cinelerra-5.1/cinelerra/tracking.C
b/cinelerra-5.1/cinelerra/tracking.C
index 4ba197e5cec27c5e9054a90639fc9431adab38e7..102178e6355a5f852b8b73a9628614de685da5ba 100644
(file)
--- a/
cinelerra-5.1/cinelerra/tracking.C
+++ b/
cinelerra-5.1/cinelerra/tracking.C
@@
-97,15
+97,11
@@
int Tracking::stop_playback()
// Not working in NPTL for some reason
// Thread::cancel();
Thread::join();
// Not working in NPTL for some reason
// Thread::cancel();
Thread::join();
-
- mwindow->stop_mixers();
-// Final position is updated continuously during playback
-// Get final position
- double position = get_tracking_position();
-// Update cursor
- update_tracker(position);
-
stop_meters();
stop_meters();
+ stop_mixers();
+// tracking_position is updated continuously during playback
+// and when render ends, update cursor with final position
+ update_tracker(get_tracking_position());
}
return 0;
}
}
return 0;
}
@@
-159,7
+155,10
@@
void Tracking::stop_meters()
mwindow->lwindow->gui->unlock_window();
}
mwindow->lwindow->gui->unlock_window();
}
-
+void Tracking::stop_mixers()
+{
+ mwindow->stop_mixers();
+}
void Tracking::update_tracker(double position)
void Tracking::update_tracker(double position)