Tweak content properties layout (#895).

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 7a4ca63a90f7703214e8403b3e1907a80d1a0916..8f2bb88a514a6ab718583d24ffa714fb2e24568b 100644 (file)
--- 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 b64e68c4b1739e0dec621877349971815ff93f49..95713d323c47b032ab17d7fc132699ca7ba3145b 100644 (file)
--- 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")
+                                       )
+                               );
+               }
        }
 }