projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8978082
)
Small re-use cleanup.
author
Carl Hetherington
<cth@carlh.net>
Wed, 20 Nov 2019 21:30:36 +0000
(22:30 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 8 Jan 2020 20:56:47 +0000
(21:56 +0100)
src/wx/film_viewer.cc
patch
|
blob
|
history
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 31093cb0a8581de14087867cbc22608c64d1dc40..c1d04be03f05e5d9f4a88d6de7f85a13409e773f 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-567,12
+567,7
@@
FilmViewer::audio_time () const
DCPTime
FilmViewer::time () const
{
- if (_audio.isStreamRunning ()) {
- return DCPTime::from_seconds (const_cast<RtAudio*>(&_audio)->getStreamTime ()) -
- DCPTime::from_frames (average_latency(), _film->audio_frame_rate());
- }
-
- return _video_view->position();
+ return audio_time().get_value_or(_video_view->position());
}
int