ISDCF name fixes with > 6 channels and HI/VI (#1633).

[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 c86ba6ef8a9995cdc8bf7f5c23e1958f5a3a16b3..137d78ad2ff7a9a2629c009bb278c495f60a8d3c 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.
 
@@ -95,7 +95,7 @@ string
 VideoContentScale::name () const
 {
        if (_ratio) {
-               return _ratio->nickname ();
+               return _ratio->image_nickname ();
        }
 
        if (_scale) {
@@ -105,21 +105,6 @@ 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.
  */