summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-29 21:26:18 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-29 21:26:18 +0100
commitebc36d56736997b40a51301a8746c6727cc34b1f (patch)
tree583db3945801ec40a0548531c99d0ba389146f7b /src/lib
parenta07b5d79f2ac072d550ccb5587fe527c5340e248 (diff)
Tweak content properties layout (#895).
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/audio_content.cc2
-rw-r--r--src/lib/content.cc24
2 files changed, 20 insertions, 6 deletions
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<UserProperty>& 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<UserProperty>& 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<string> (_video_frame_rate.get(), 5), _("frames per second")
- )
- );
+ if (video) {
+ p.push_back (
+ UserProperty (
+ UserProperty::VIDEO,
+ _("Frame rate"),
+ raw_convert<string> (_video_frame_rate.get(), 5),
+ _("frames per second")
+ )
+ );
+ } else {
+ p.push_back (
+ UserProperty (
+ UserProperty::GENERAL,
+ _("Prepared for video frame rate"),
+ raw_convert<string> (_video_frame_rate.get(), 5),
+ _("frames per second")
+ )
+ );
+ }
}
}