X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_viewer.cc;h=d862bcd243a3892c9b31c0b50db90a5b674996d3;hb=d5c059a2ff9bab5c2973db6bc4860591679dd42b;hp=2c90b86095278c9bd19b81831e27f3d82123909b;hpb=cfbe9d2f44e380efed7a61b5b5c7a2fec7794915;p=dcpomatic.git

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 2c90b8609..d862bcd24 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -32,36 +32,37 @@
 #include "playhead_to_timecode_dialog.h"
 #include "simple_video_view.h"
 #include "wx_util.h"
-#include "lib/film.h"
-#include "lib/ratio.h"
-#include "lib/util.h"
-#include "lib/job_manager.h"
-#include "lib/image.h"
-#include "lib/exceptions.h"
+#include "lib/butler.h"
+#include "lib/compose.hpp"
+#include "lib/config.h"
+#include "lib/dcpomatic_log.h"
 #include "lib/examine_content_job.h"
+#include "lib/exceptions.h"
+#include "lib/film.h"
 #include "lib/filter.h"
+#include "lib/image.h"
+#include "lib/job_manager.h"
+#include "lib/log.h"
 #include "lib/player.h"
 #include "lib/player_video.h"
+#include "lib/ratio.h"
+#include "lib/text_content.h"
+#include "lib/timer.h"
+#include "lib/util.h"
 #include "lib/video_content.h"
 #include "lib/video_decoder.h"
-#include "lib/timer.h"
-#include "lib/butler.h"
-#include "lib/log.h"
-#include "lib/config.h"
-#include "lib/compose.hpp"
-#include "lib/dcpomatic_log.h"
-#include "lib/text_content.h"
+#include <dcp/exceptions.h>
+#include <dcp/warnings.h>
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
-#include <dcp/exceptions.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/tglbtn.h>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
 #include <iomanip>
 
 
 using std::bad_alloc;
-using std::cout;
 using std::dynamic_pointer_cast;
 using std::make_shared;
 using std::max;
@@ -117,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 ()
 {
@@ -223,7 +224,7 @@ FilmViewer::recreate_butler ()
 		_player,
 		Config::instance()->audio_mapping(_audio_channels),
 		_audio_channels,
-		bind(&PlayerVideo::force, _1, AV_PIX_FMT_RGB24),
+		boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
 		VideoRange::FULL,
 		j2k_gl_optimised ? Image::Alignment::COMPACT : Image::Alignment::PADDED,
 		true,
@@ -283,17 +284,21 @@ FilmViewer::calculate_sizes ()
 
 	auto const container = _film->container ();
 
-	auto const view_ratio = float(_video_view->get()->GetSize().x) / _video_view->get()->GetSize().y;
+	auto const scale = dpi_scale_factor (_video_view->get());
+	int const video_view_width = std::round(_video_view->get()->GetSize().x * scale);
+	int const video_view_height = std::round(_video_view->get()->GetSize().y * scale);
+
+	auto const view_ratio = float(video_view_width) / video_view_height;
 	auto const film_ratio = container ? container->ratio () : 1.78;
 
 	dcp::Size out_size;
 	if (view_ratio < film_ratio) {
 		/* panel is less widscreen than the film; clamp width */
-		out_size.width = _video_view->get()->GetSize().x;
+		out_size.width = video_view_width;
 		out_size.height = lrintf (out_size.width / film_ratio);
 	} else {
 		/* panel is more widescreen than the film; clamp height */
-		out_size.height = _video_view->get()->GetSize().y;
+		out_size.height = video_view_height;
 		out_size.width = lrintf (out_size.height * film_ratio);
 	}
 
@@ -315,16 +320,31 @@ FilmViewer::suspend ()
 }
 
 
+void
+FilmViewer::start_audio_stream_if_open ()
+{
+	if (_audio.isStreamOpen()) {
+		_audio.setStreamTime (_video_view->position().seconds());
+		try {
+			_audio.startStream ();
+		} catch (RtAudioError& e) {
+			_audio_channels = 0;
+			error_dialog (
+				_video_view->get(),
+				_("There was a problem starting audio playback.  Please try another audio output device in Preferences."), std_to_wx(e.what())
+				);
+		}
+	}
+}
+
+
 void
 FilmViewer::resume ()
 {
 	DCPOMATIC_ASSERT (_suspended > 0);
 	--_suspended;
 	if (_playing && !_suspended) {
-		if (_audio.isStreamOpen()) {
-			_audio.setStreamTime (_video_view->position().seconds());
-			_audio.startStream ();
-		}
+		start_audio_stream_if_open ();
 		_video_view->start ();
 	}
 }
@@ -354,18 +374,7 @@ FilmViewer::start ()
 	/* Take the video view's idea of position as our `playhead' and start the
 	   audio stream (which is the timing reference) there.
          */
-	if (_audio.isStreamOpen()) {
-		_audio.setStreamTime (_video_view->position().seconds());
-		try {
-			_audio.startStream ();
-		} catch (RtAudioError& e) {
-			_audio_channels = 0;
-			error_dialog (
-				_video_view->get(),
-				_("There was a problem starting audio playback.  Please try another audio output device in Preferences."), std_to_wx(e.what())
-				);
-		}
-	}
+	start_audio_stream_if_open ();
 
 	_playing = true;
 	/* Calling start() below may directly result in Stopped being emitted, and if that
@@ -703,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
 {
@@ -786,3 +802,21 @@ FilmViewer::set_optimise_for_j2k (bool o)
 	_video_view->set_optimise_for_j2k (o);
 }
 
+
+void
+FilmViewer::set_crop_guess (Rect<float> crop)
+{
+	if (crop != _crop_guess) {
+		_crop_guess = crop;
+		_video_view->update ();
+	}
+}
+
+
+void
+FilmViewer::unset_crop_guess ()
+{
+	_crop_guess = {};
+	_video_view->update ();
+}
+