projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix macOS build.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.cc
diff --git
a/src/wx/film_viewer.cc
b/src/wx/film_viewer.cc
index 8cff277f30ed64aec900c2a8575539fe959124d5..0e6e908b3245c88fb8e9851e4e898a452c8d64bb 100644
(file)
--- a/
src/wx/film_viewer.cc
+++ b/
src/wx/film_viewer.cc
@@
-51,14
+51,14
@@
#include "lib/util.h"
#include "lib/video_content.h"
#include "lib/video_decoder.h"
#include "lib/util.h"
#include "lib/video_content.h"
#include "lib/video_decoder.h"
-#include "lib/warnings.h"
+#include <dcp/exceptions.h>
+#include <dcp/warnings.h>
extern "C" {
#include <libavutil/pixfmt.h>
}
extern "C" {
#include <libavutil/pixfmt.h>
}
-#include <dcp/exceptions.h>
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
#include <wx/tglbtn.h>
#include <wx/tglbtn.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <iomanip>
#include <iomanip>
@@
-118,7
+118,7
@@
FilmViewer::~FilmViewer ()
}
}
-/** Ask for ::
get
() to be called next time we are idle */
+/** Ask for ::
idle_handler
() to be called next time we are idle */
void
FilmViewer::request_idle_display_next_frame ()
{
void
FilmViewer::request_idle_display_next_frame ()
{
@@
-712,6
+712,13
@@
FilmViewer::dcp_decode_reduction () const
}
}
+optional<ContentTime>
+FilmViewer::position_in_content (shared_ptr<const Content> content) const
+{
+ return _player->dcp_to_content_time (content, position());
+}
+
+
DCPTime
FilmViewer::one_video_frame () const
{
DCPTime
FilmViewer::one_video_frame () const
{
@@
-795,3
+802,21
@@
FilmViewer::set_optimise_for_j2k (bool o)
_video_view->set_optimise_for_j2k (o);
}
_video_view->set_optimise_for_j2k (o);
}
+
+void
+FilmViewer::set_crop_guess (dcpomatic::Rect<float> crop)
+{
+ if (crop != _crop_guess) {
+ _crop_guess = crop;
+ _video_view->update ();
+ }
+}
+
+
+void
+FilmViewer::unset_crop_guess ()
+{
+ _crop_guess = {};
+ _video_view->update ();
+}
+