X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=f83c9563b29ce80cab262ad02c22c913219cf835;hb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;hp=c8ac591a7b2919a36a6f77080dad538417c08982;hpb=9e4c091e6ef0f79fab10664e95240de2f14e5702;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index c8ac591a7..f83c9563b 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -31,6 +31,7 @@
 #include "subtitle_content.h"
 #include "subrip_decoder.h"
 #include "subrip_content.h"
+#include "dcp_content.h"
 #include "playlist.h"
 #include "job.h"
 #include "image.h"
@@ -189,7 +190,8 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 		property == ContentProperty::TRIM_START ||
 		property == ContentProperty::TRIM_END ||
 		property == ContentProperty::PATH ||
-		property == VideoContentProperty::VIDEO_FRAME_TYPE
+		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
+		property == DCPContentProperty::CAN_BE_PLAYED
 		) {
 		
 		_have_valid_pieces = false;
@@ -199,7 +201,8 @@ Player::content_changed (weak_ptr<Content> w, int property, bool frequent)
 		property == SubtitleContentProperty::USE_SUBTITLES ||
 		property == SubtitleContentProperty::SUBTITLE_X_OFFSET ||
 		property == SubtitleContentProperty::SUBTITLE_Y_OFFSET ||
-		property == SubtitleContentProperty::SUBTITLE_SCALE ||
+		property == SubtitleContentProperty::SUBTITLE_X_SCALE ||
+		property == SubtitleContentProperty::SUBTITLE_Y_SCALE ||
 		property == VideoContentProperty::VIDEO_CROP ||
 		property == VideoContentProperty::VIDEO_SCALE ||
 		property == VideoContentProperty::VIDEO_FRAME_RATE
@@ -258,8 +261,8 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 		 *     rect.x * _video_container_size.width and rect.y * _video_container_size.height.
 		 *
 		 * 2.  that to shift the origin of the scale by subtitle_scale to the centre of the subtitle; this will be
-		 *     (width_before_subtitle_scale * (1 - subtitle_scale) / 2) and
-		 *     (height_before_subtitle_scale * (1 - subtitle_scale) / 2).
+		 *     (width_before_subtitle_scale * (1 - subtitle_x_scale) / 2) and
+		 *     (height_before_subtitle_scale * (1 - subtitle_y_scale) / 2).
 		 *
 		 * Combining these two translations gives these expressions.
 		 */
@@ -340,7 +343,7 @@ Player::get_video (DCPTime time, bool accurate)
 			return pvf;
 		}
 		
-		dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size ());
+		dcp::Size image_size = content->scale().size (content, _video_container_size, _film->frame_size (), _approximate_size ? 4 : 1);
 		if (_approximate_size) {
 			image_size.width &= ~3;
 			image_size.height &= ~3;
@@ -556,12 +559,12 @@ Player::get_subtitles (DCPTime time, DCPTime length, bool starting)
 			i->sub.rectangle.y += subtitle_content->subtitle_y_offset ();
 
 			/* Apply content's subtitle scale */
-			i->sub.rectangle.width *= subtitle_content->subtitle_scale ();
-			i->sub.rectangle.height *= subtitle_content->subtitle_scale ();
+			i->sub.rectangle.width *= subtitle_content->subtitle_x_scale ();
+			i->sub.rectangle.height *= subtitle_content->subtitle_y_scale ();
 
 			/* Apply a corrective translation to keep the subtitle centred after that scale */
-			i->sub.rectangle.x -= i->sub.rectangle.width * (subtitle_content->subtitle_scale() - 1);
-			i->sub.rectangle.y -= i->sub.rectangle.height * (subtitle_content->subtitle_scale() - 1);
+			i->sub.rectangle.x -= i->sub.rectangle.width * (subtitle_content->subtitle_x_scale() - 1);
+			i->sub.rectangle.y -= i->sub.rectangle.height * (subtitle_content->subtitle_y_scale() - 1);
 			
 			ps.image.push_back (i->sub);
 		}