From ebc36d56736997b40a51301a8746c6727cc34b1f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 Jun 2016 21:26:18 +0100 Subject: Tweak content properties layout (#895). --- src/lib/audio_content.cc | 2 +- src/lib/content.cc | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc index 7a4ca63a9..8f2bb88a5 100644 --- a/src/lib/audio_content.cc +++ b/src/lib/audio_content.cc @@ -324,7 +324,7 @@ AudioContent::add_properties (list& p) const ); } - p.push_back (UserProperty (UserProperty::AUDIO, _("DCP frame rate"), resampled_frame_rate (), _("Hz"))); + p.push_back (UserProperty (UserProperty::AUDIO, _("DCP sample rate"), resampled_frame_rate (), _("Hz"))); p.push_back (UserProperty (UserProperty::LENGTH, _("Full length in video frames at DCP rate"), c.frames_round (frc.dcp))); if (stream) { diff --git a/src/lib/content.cc b/src/lib/content.cc index b64e68c4b..95713d323 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -362,10 +362,24 @@ Content::add_properties (list& p) const p.push_back (UserProperty (UserProperty::GENERAL, _("Filename"), path(0).string ())); if (_video_frame_rate) { - p.push_back ( - UserProperty ( - UserProperty::GENERAL, _("Video frame rate"), raw_convert (_video_frame_rate.get(), 5), _("frames per second") - ) - ); + if (video) { + p.push_back ( + UserProperty ( + UserProperty::VIDEO, + _("Frame rate"), + raw_convert (_video_frame_rate.get(), 5), + _("frames per second") + ) + ); + } else { + p.push_back ( + UserProperty ( + UserProperty::GENERAL, + _("Prepared for video frame rate"), + raw_convert (_video_frame_rate.get(), 5), + _("frames per second") + ) + ); + } } } -- cgit v1.2.3