Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/dcp_subtitle_content.h b/src/lib/dcp_subtitle_content.h
index 5794b59516e6767f586cc5d0a33663b2ed9ef376..8873283931114383a74a1d0411eafc2a78300dc3 100644 (file)
--- a/src/lib/dcp_subtitle_content.h
+++ b/src/lib/dcp_subtitle_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,8 +18,9 @@
 */
 
 #include "subtitle_content.h"
+#include "dcp_subtitle.h"
 
-class DCPSubtitleContent : public SubtitleContent
+class DCPSubtitleContent : public SubtitleContent, public DCPSubtitle
 {
 public:
        DCPSubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -29,15 +30,24 @@ public:
        void examine (boost::shared_ptr<Job>);
        std::string summary () const;
        std::string technical_summary () const;
-       std::string information () const;
        void as_xml (xmlpp::Node *) const;
        DCPTime full_length () const;
 
        /* SubtitleContent */
-       bool has_subtitles () const {
+
+       bool has_text_subtitles () const {
                return true;
        }
 
+       bool has_image_subtitles () const {
+               return false;
+       }
+
+       double subtitle_video_frame_rate () const;
+       void set_subtitle_video_frame_rate (int r);
+
 private:
-       DCPTime _length;
+       ContentTime _length;
+       /** Video frame rate that this content has been prepared for, if known */
+       boost::optional<double> _frame_rate;
 };