summaryrefslogtreecommitdiff
path: root/src/lib/video_content.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/video_content.cc')
-rw-r--r--src/lib/video_content.cc17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index b0d4c2de5..5a80dba74 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -476,7 +476,7 @@ VideoContentScale::id () const
SafeStringStream s;
if (_ratio) {
- s << _ratio->id () << "_";
+ s << _ratio->id ();
} else {
s << (_scale ? "S1" : "S0");
}
@@ -498,6 +498,21 @@ 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.
*/