projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index d84a0af340c31e413b6cd65bb68f1e40f22bdf4b..74e3b81ed82df4126c5ea1b5bee202b2feb3621b 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-34,7
+34,7
@@
#include "lib/examine_content_job.h"
#include "lib/filter.h"
#include "lib/player.h"
#include "lib/examine_content_job.h"
#include "lib/filter.h"
#include "lib/player.h"
-#include "lib/player_video
_frame
.h"
+#include "lib/player_video.h"
#include "lib/video_content.h"
#include "lib/video_decoder.h"
#include "lib/timer.h"
#include "lib/video_content.h"
#include "lib/video_decoder.h"
#include "lib/timer.h"
@@
-151,16
+151,16
@@
FilmViewer::get (DCPTime p, bool accurate)
return;
}
return;
}
- list<shared_ptr<PlayerVideo
Frame
> > pvf = _player->get_video (p, accurate);
+ list<shared_ptr<PlayerVideo> > pvf = _player->get_video (p, accurate);
if (!pvf.empty ()) {
if (!pvf.empty ()) {
- _frame = pvf.front()->image ();
+ _frame = pvf.front()->image (
true
);
_frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false);
_frame = _frame->scale (_frame->size(), Scaler::from_id ("fastbilinear"), PIX_FMT_RGB24, false);
+ _position = pvf.front()->time ();
} else {
_frame.reset ();
} else {
_frame.reset ();
+ _position = p;
}
}
- _position = p;
-
set_position_text ();
_panel->Refresh ();
_panel->Update ();
set_position_text ();
_panel->Refresh ();
_panel->Update ();