Split audio; builds.

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

diff --git a/src/lib/dcp_subtitle_content.cc b/src/lib/dcp_subtitle_content.cc
index 440b10a196922ba2dec736d17cd29d3fd4441dc9..3feb8947abc13261fad49575fffbff8325bd9142 100644 (file)
--- a/src/lib/dcp_subtitle_content.cc
+++ b/src/lib/dcp_subtitle_content.cc
@@ -21,6 +21,7 @@
 #include "dcp_subtitle_content.h"
 #include "raw_convert.h"
 #include "film.h"
+#include "subtitle_content.h"
 #include <dcp/interop_subtitle_asset.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <dcp/interop_load_font_node.h>
@@ -36,18 +37,15 @@ using boost::dynamic_pointer_cast;
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, boost::filesystem::path path)
        : Content (film, path)
-       , SubtitleContent (film, path)
 {
-
+       subtitle.reset (new SubtitleContent (this, film));
 }
 
 DCPSubtitleContent::DCPSubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version)
        : Content (film, node)
-       , SubtitleContent (film, node, version)
        , _length (node->number_child<ContentTime::Type> ("Length"))
-       , _frame_rate (node->optional_number_child<int>("SubtitleFrameRate"))
 {
-
+       subtitle.reset (new SubtitleContent (this, film, node, version));
 }
 
 void
@@ -58,33 +56,31 @@ DCPSubtitleContent::examine (shared_ptr<Job> job)
        shared_ptr<dcp::SubtitleAsset> sc = load (path (0));
 
        /* Default to turning these subtitles on */
-       set_use_subtitles (true);
+       subtitle->set_use_subtitles (true);
 
        boost::mutex::scoped_lock lm (_mutex);
 
        shared_ptr<dcp::InteropSubtitleAsset> iop = dynamic_pointer_cast<dcp::InteropSubtitleAsset> (sc);
        if (iop) {
-               _subtitle_language = iop->language ();
+               subtitle->set_subtitle_language (iop->language ());
        }
        shared_ptr<dcp::SMPTESubtitleAsset> smpte = dynamic_pointer_cast<dcp::SMPTESubtitleAsset> (sc);
        if (smpte) {
-               _subtitle_language = smpte->language().get_value_or ("");
-               _frame_rate = smpte->edit_rate().numerator;
+               subtitle->set_subtitle_language (smpte->language().get_value_or (""));
+               subtitle->set_subtitle_video_frame_rate (smpte->edit_rate().numerator);
        }
 
        _length = ContentTime::from_seconds (sc->latest_subtitle_out().as_seconds ());
 
        BOOST_FOREACH (shared_ptr<dcp::LoadFontNode> i, sc->load_font_nodes ()) {
-               add_font (shared_ptr<Font> (new Font (i->id)));
+               subtitle->add_font (shared_ptr<Font> (new Font (i->id)));
        }
 }
 
 DCPTime
 DCPSubtitleContent::full_length () const
 {
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       FrameRateChange const frc (subtitle_video_frame_rate(), film->video_frame_rate());
+       FrameRateChange const frc (subtitle->subtitle_video_frame_rate(), film()->video_frame_rate());
        return DCPTime (_length, frc);
 }
 
@@ -105,33 +101,6 @@ DCPSubtitleContent::as_xml (xmlpp::Node* node) const
 {
        node->add_child("Type")->add_child_text ("DCPSubtitle");
        Content::as_xml (node);
-       SubtitleContent::as_xml (node);
+       subtitle->as_xml (node);
        node->add_child("Length")->add_child_text (raw_convert<string> (_length.get ()));
 }
-
-void
-DCPSubtitleContent::set_subtitle_video_frame_rate (int r)
-{
-       {
-               boost::mutex::scoped_lock lm (_mutex);
-               _frame_rate = r;
-       }
-
-       signal_changed (SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE);
-}
-
-double
-DCPSubtitleContent::subtitle_video_frame_rate () const
-{
-       boost::mutex::scoped_lock lm (_mutex);
-       if (_frame_rate) {
-               return _frame_rate.get ();
-       }
-
-       /* No frame rate specified, so assume this content has been
-          prepared for any concurrent video content.
-       */
-       shared_ptr<const Film> film = _film.lock ();
-       DCPOMATIC_ASSERT (film);
-       return film->active_frame_rate_change(position()).source;
-}