X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=13f2cf51676a9d10bb3b6acce245457d1dd2db66;hb=34be35fc1ba9a0c0eaebd3e2a6be3eab134e80af;hp=5a80dba7455cab235aaa34f1d7855b681a9f4620;hpb=8b540964a31926f4afc2be3937a01b28f7c91689;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 5a80dba74..13f2cf516 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -53,8 +53,6 @@ using boost::optional;
 using boost::dynamic_pointer_cast;
 using libdcp::raw_convert;
 
-vector<VideoContentScale> VideoContentScale::_scales;
-
 VideoContent::VideoContent (shared_ptr<const Film> f)
 	: Content (f)
 	, _video_length (0)
@@ -427,138 +425,3 @@ VideoContent::set_video_frame_rate (float r)
 	signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
 }
 
-VideoContentScale::VideoContentScale (Ratio const * r)
-	: _ratio (r)
-	, _scale (true)
-{
-
-}
-
-VideoContentScale::VideoContentScale ()
-	: _ratio (0)
-	, _scale (false)
-{
-
-}
-
-VideoContentScale::VideoContentScale (bool scale)
-	: _ratio (0)
-	, _scale (scale)
-{
-
-}
-
-VideoContentScale::VideoContentScale (shared_ptr<cxml::Node> node)
-	: _ratio (0)
-	, _scale (true)
-{
-	optional<string> r = node->optional_string_child ("Ratio");
-	if (r) {
-		_ratio = Ratio::from_id (r.get ());
-	} else {
-		_scale = node->bool_child ("Scale");
-	}
-}
-
-void
-VideoContentScale::as_xml (xmlpp::Node* node) const
-{
-	if (_ratio) {
-		node->add_child("Ratio")->add_child_text (_ratio->id ());
-	} else {
-		node->add_child("Scale")->add_child_text (_scale ? "1" : "0");
-	}
-}
-
-string
-VideoContentScale::id () const
-{
-	SafeStringStream s;
-	
-	if (_ratio) {
-		s << _ratio->id ();
-	} else {
-		s << (_scale ? "S1" : "S0");
-	}
-	
-	return s.str ();
-}
-
-string
-VideoContentScale::name () const
-{
-	if (_ratio) {
-		return _ratio->nickname ();
-	}
-
-	if (_scale) {
-		return _("No stretch");
-	}
-
-	return _("No scale");
-}
-
-VideoContentScale
-VideoContentScale::from_id (string id)
-{
-	Ratio const * r = Ratio::from_id (id);
-	if (r) {
-		return VideoContentScale (r);
-	}
-
-	if (id == "S0") {
-		return VideoContentScale (false);
-	}
-
-	return VideoContentScale (true);
-}
-		
-/** @param display_container Size of the container that we are displaying this content in.
- *  @param film_container The size of the film's image.
- */
-libdcp::Size
-VideoContentScale::size (shared_ptr<const VideoContent> c, libdcp::Size display_container, libdcp::Size film_container) const
-{
-	if (_ratio) {
-		return fit_ratio_within (_ratio->ratio (), display_container);
-	}
-
-	libdcp::Size const ac = c->video_size_after_crop ();
-
-	/* Force scale if the film_container is smaller than the content's image */
-	if (_scale || film_container.width < ac.width || film_container.height < ac.height) {
-		return fit_ratio_within (ac.ratio (), display_container);
-	}
-
-	/* Scale the image so that it will be in the right place in film_container, even if display_container is a
-	   different size.
-	*/
-	return libdcp::Size (
-		c->video_size().width  * float(display_container.width)  / film_container.width,
-		c->video_size().height * float(display_container.height) / film_container.height
-		);
-}
-
-void
-VideoContentScale::setup_scales ()
-{
-	vector<Ratio const *> ratios = Ratio::all ();
-	for (vector<Ratio const *>::const_iterator i = ratios.begin(); i != ratios.end(); ++i) {
-		_scales.push_back (VideoContentScale (*i));
-	}
-
-	_scales.push_back (VideoContentScale (true));
-	_scales.push_back (VideoContentScale (false));
-}
-
-bool
-operator== (VideoContentScale const & a, VideoContentScale const & b)
-{
-	return (a.ratio() == b.ratio() && a.scale() == b.scale());
-}
-
-bool
-operator!= (VideoContentScale const & a, VideoContentScale const & b)
-{
-	return (a.ratio() != b.ratio() || a.scale() != b.scale());
-}