diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-07 23:36:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-07 23:36:40 +0100 |
| commit | 5dc2dbdb6639f8d617a40209ad603d2a38f9df2a (patch) | |
| tree | 849db948bfed659df5a9f5bfb2bdb8519c313de6 /src/lib/video_content.cc | |
| parent | a4d3b0b6b1069b08fff0559f63d73bb7353256bd (diff) | |
| parent | 38fd8d2d230a239079ffdf3e10a48833ade6e8c5 (diff) | |
Merge master.
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 796e6575a..9822d7763 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -482,7 +482,7 @@ VideoContentScale::id () const SafeStringStream s; if (_ratio) { - s << _ratio->id () << "_"; + s << _ratio->id (); } else { s << (_scale ? "S1" : "S0"); } @@ -504,6 +504,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. */ |