Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / audio_content.cc

diff --git a/src/lib/audio_content.cc b/src/lib/audio_content.cc
index 57f878b71b1bd53c224256d203b6da21ae9529cc..4e9d5cd5cee5395b3a22058fd0cf6c08f57e1e57 100644 (file)
--- a/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@ -35,7 +35,6 @@
 using std::string;
 using std::cout;
 using std::vector;
-using std::stringstream;
 using std::fixed;
 using std::list;
 using std::pair;
@@ -75,7 +74,6 @@ AudioContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
                return shared_ptr<AudioContent> ();
        }
 
-       /* Can't use make_shared here as the constructor is private */
        return shared_ptr<AudioContent> (new AudioContent (parent, node));
 }
 
@@ -325,7 +323,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) {