Make terminate_threads() less likely to leave _threads containing invalid pointers.

[dcpomatic.git] / src / lib / video_content_scale.cc

diff --git a/src/lib/video_content_scale.cc b/src/lib/video_content_scale.cc
index 47ceab5d1f2f4516f21b071081e4d298abf2f419..73dfd27fef38d9ef4ea5a9cbf707952e0dfee4f7 100644 (file)
--- a/src/lib/video_content_scale.cc
+++ b/src/lib/video_content_scale.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,7 +22,6 @@
 #include "video_content.h"
 #include "ratio.h"
 #include "util.h"
-#include <locked_sstream.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/optional.hpp>
@@ -85,22 +84,18 @@ VideoContentScale::as_xml (xmlpp::Node* node) const
 string
 VideoContentScale::id () const
 {
-       locked_stringstream s;
-
        if (_ratio) {
-               s << _ratio->id ();
-       } else {
-               s << (_scale ? "S1" : "S0");
+               return _ratio->id ();
        }
 
-       return s.str ();
+       return (_scale ? "S1" : "S0");
 }
 
 string
 VideoContentScale::name () const
 {
        if (_ratio) {
-               return _ratio->nickname ();
+               return _ratio->image_nickname ();
        }
 
        if (_scale) {
@@ -110,30 +105,17 @@ VideoContentScale::name () const
        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.
+ *  @return Size, in pixels that the VideoContent's image should be scaled to (taking into account its pixel aspect ratio)
  */
 dcp::Size
 VideoContentScale::size (shared_ptr<const VideoContent> c, dcp::Size display_container, dcp::Size film_container) const
 {
        /* Work out the size of the content if it were put inside film_container */
 
-       dcp::Size const video_size_after_crop = c->size_after_crop ();
+       dcp::Size video_size_after_crop = c->size_after_crop();
+       video_size_after_crop.width *= c->sample_aspect_ratio().get_value_or(1);
 
        dcp::Size size;