diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-07 21:49:36 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-07 21:49:36 +0100 |
| commit | 4956be4e16570fa6b6985b11d4d689308343ffbb (patch) | |
| tree | a08208b060fd73392841a68be77fd3639bb67a5e /src/lib/video_content.cc | |
| parent | 5a0b2926fbc57ecdecc6c9a865c9683224be4ee6 (diff) | |
Use VideoContentScale rather than Ratio for the default scale to.
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 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. */ |