A few build fixes.

6 files changed, 16 insertions, 16 deletions

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 57e3791a2..ef29d35fd 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -170,10 +170,6 @@ Film::video_state_identifier () const
 	  << "_" << j2k_bandwidth()
 	  << "_" << lexical_cast<int> (colour_lut());
 
-	if (trim_type() == ENCODE) {
-		s << "_" << trim_start() << "_" << trim_end();
-	}
-
 	if (ab()) {
 		pair<string, string> fa = Filter::ffmpeg_strings (Config::instance()->reference_filters());
 		s << "ab_" << Config::instance()->reference_scaler()->id() << "_" << fa.first << "_" << fa.second;
diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc
index 2815fccd8..211f04763 100644
--- a/src/lib/subtitle.cc
+++ b/src/lib/subtitle.cc
@@ -110,13 +110,13 @@ Subtitle::Subtitle (Position p, shared_ptr<Image> i)
  *  in the coordinate space of the source.
  *  @param subtitle_scale scaling factor to apply to the subtitle image.
  */
-dvdomatic::Rect
+dcpomatic::Rect
 subtitle_transformed_area (
 	float target_x_scale, float target_y_scale,
-	dvdomatic::Rect sub_area, int subtitle_offset, float subtitle_scale
+	dcpomatic::Rect sub_area, int subtitle_offset, float subtitle_scale
 	)
 {
-	dvdomatic::Rect tx;
+	dcpomatic::Rect tx;
 
 	sub_area.y += subtitle_offset;
 
@@ -145,8 +145,8 @@ subtitle_transformed_area (
 }
 
 /** @return area that this subtitle takes up, in the original uncropped source's coordinate space */
-dvdomatic::Rect
+dcpomatic::Rect
 Subtitle::area () const
 {
-	return dvdomatic::Rect (_position.x, _position.y, _image->size().width, _image->size().height);
+	return dcpomatic::Rect (_position.x, _position.y, _image->size().width, _image->size().height);
 }
diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h
index c3929d676..1151bc01d 100644
--- a/src/lib/subtitle.h
+++ b/src/lib/subtitle.h
@@ -48,17 +48,17 @@ public:
 		return _image;
 	}
 
-	dvdomatic::Rect area () const;
+	dcpomatic::Rect area () const;
 	
 private:
 	Position _position;
 	boost::shared_ptr<Image> _image;
 };
 
-dvdomatic::Rect
+dcpomatic::Rect
 subtitle_transformed_area (
 	float target_x_scale, float target_y_scale,
-	dvdomatic::Rect sub_area, int subtitle_offset, float subtitle_scale
+	dcpomatic::Rect sub_area, int subtitle_offset, float subtitle_scale
 	);
 
 /** A Subtitle class with details of the time over which it should be shown */
diff --git a/src/lib/types.cc b/src/lib/types.cc
index c077bad3e..78cb4cd64 100644
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -36,8 +36,8 @@ bool operator!= (Crop const & a, Crop const & b)
 /** @param other A Rect.
  *  @return The intersection of this with `other'.
  */
-Rect
-Rect::intersection (Rect const & other) const
+dcpomatic::Rect
+dcpomatic::Rect::intersection (Rect const & other) const
 {
 	int const tx = max (x, other.x);
 	int const ty = max (y, other.y);
@@ -50,7 +50,7 @@ Rect::intersection (Rect const & other) const
 }
 
 bool
-Rect::contains (Position p) const
+dcpomatic::Rect::contains (Position p) const
 {
 	return (p.x >= x && p.x <= (x + width) && p.y >= y && p.y <= (y + height));
 }
diff --git a/src/lib/types.h b/src/lib/types.h
index 8f2fe2c71..70262afb0 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -76,6 +76,8 @@ struct Position
 	int y;
 };
 
+namespace dcpomatic {
+
 /** @struct Rect
  *  @brief A rectangle.
  */
@@ -113,4 +115,6 @@ struct Rect
 	bool contains (Position) const;
 };
 
+}
+
 #endif
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 086a6b552..a5147f42e 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -67,7 +67,7 @@ VideoDecoder::video (shared_ptr<Image> image, bool same, Time t)
 	}
 
 	if (sub) {
-		Rect const tx = subtitle_transformed_area (
+		dcpomatic::Rect const tx = subtitle_transformed_area (
 			float (image_size.width) / video_size().width,
 			float (image_size.height) / video_size().height,
 			sub->area(), film->subtitle_offset(), film->subtitle_scale()