Clean up after previous commit.

[dcpomatic.git] / src / lib / content.h

diff --git a/src/lib/content.h b/src/lib/content.h
index f0a2d0bdb1fe79ca05008b2eababe83e13ac69ee..7ff20e96cba4a335f219d4aed2eb5748a98951ae 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -63,7 +63,7 @@ public:
 class Content : public boost::enable_shared_from_this<Content>, public Signaller, public boost::noncopyable
 {
 public:
-       Content (boost::shared_ptr<const Film>);
+       explicit Content (boost::shared_ptr<const Film>);
        Content (boost::shared_ptr<const Film>, DCPTime);
        Content (boost::shared_ptr<const Film>, boost::filesystem::path);
        Content (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
@@ -166,6 +166,7 @@ public:
        }
 
        void set_video_frame_rate (double r);
+       void unset_video_frame_rate ();
 
        double active_video_frame_rate () const;
 
@@ -181,7 +182,7 @@ public:
 
        boost::shared_ptr<VideoContent> video;
        boost::shared_ptr<AudioContent> audio;
-       boost::shared_ptr<SubtitleContent> subtitle;
+       boost::shared_ptr<CaptionContent> caption;
 
        void signal_changed (int);