X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer.cc;h=fc13325730142222a5bbc18185ebe6d019416689;hb=6fde557864505b470c438e4161ee494f29b90d63;hp=10e47686283d7df200c15e7ff88193909305fc06;hpb=3d03159691a2a9a545f5d58831d245f01480d612;p=dcpomatic.git

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 10e476862..fc1332573 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -27,8 +27,8 @@
 #include "sndfile_decoder.h"
 #include "sndfile_content.h"
 #include "subtitle_content.h"
-#include "subrip_decoder.h"
-#include "subrip_content.h"
+#include "text_subtitle_decoder.h"
+#include "text_subtitle_content.h"
 #include "dcp_content.h"
 #include "job.h"
 #include "image.h"
@@ -174,10 +174,10 @@ Player::setup_pieces ()
 		   as simultaneous video content (like we do with audio).
 		*/
 
-		/* SubRipContent */
-		shared_ptr<const SubRipContent> rc = dynamic_pointer_cast<const SubRipContent> (i);
+		/* TextSubtitleContent */
+		shared_ptr<const TextSubtitleContent> rc = dynamic_pointer_cast<const TextSubtitleContent> (i);
 		if (rc) {
-			decoder.reset (new SubRipDecoder (rc));
+			decoder.reset (new TextSubtitleDecoder (rc));
 			frc = FrameRateChange (rc->subtitle_video_frame_rate(), _film->video_frame_rate());
 		}
 
@@ -219,7 +219,10 @@ Player::playlist_content_changed (weak_ptr<Content> w, int property, bool freque
 		property == ContentProperty::TRIM_END ||
 		property == ContentProperty::PATH ||
 		property == VideoContentProperty::VIDEO_FRAME_TYPE ||
-		property == DCPContentProperty::CAN_BE_PLAYED
+		property == DCPContentProperty::CAN_BE_PLAYED ||
+		property == TextSubtitleContentProperty::TEXT_SUBTITLE_COLOUR ||
+		property == TextSubtitleContentProperty::TEXT_SUBTITLE_OUTLINE ||
+		property == TextSubtitleContentProperty::TEXT_SUBTITLE_OUTLINE_COLOUR
 		) {
 
 		_have_valid_pieces = false;