diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-13 14:46:01 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | 334b94526f2c1271718a94fe97cfa843cf6ef7a1 (patch) | |
| tree | 67fa8769c7fb72ec6bff799c2a3d1b087454734a /src/lib/subtitle_content.cc | |
| parent | 78664f8073256de51355c9162f61a4ae4fa560d7 (diff) | |
Basics of subtitle split.
Diffstat (limited to 'src/lib/subtitle_content.cc')
| -rw-r--r-- | src/lib/subtitle_content.cc | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/src/lib/subtitle_content.cc b/src/lib/subtitle_content.cc index 48c9e9cf6..bdc2b729c 100644 --- a/src/lib/subtitle_content.cc +++ b/src/lib/subtitle_content.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2016 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 @@ -47,8 +47,8 @@ int const SubtitleContentProperty::SUBTITLE_LANGUAGE = 506; int const SubtitleContentProperty::FONTS = 507; int const SubtitleContentProperty::SUBTITLE_VIDEO_FRAME_RATE = 508; -SubtitleContent::SubtitleContent (shared_ptr<const Film> film) - : Content (film) +SubtitleContent::SubtitleContent (Content* parent, shared_ptr<const Film> film) + : ContentPart (parent, film) , _use_subtitles (false) , _burn_subtitles (false) , _subtitle_x_offset (0) @@ -59,20 +59,8 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> film) } -SubtitleContent::SubtitleContent (shared_ptr<const Film> film, boost::filesystem::path p) - : Content (film, p) - , _use_subtitles (false) - , _burn_subtitles (false) - , _subtitle_x_offset (0) - , _subtitle_y_offset (0) - , _subtitle_x_scale (1) - , _subtitle_y_scale (1) -{ - -} - -SubtitleContent::SubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) - : Content (film, node) +SubtitleContent::SubtitleContent (Content* parent, shared_ptr<const Film> film, cxml::ConstNodePtr node, int version) + : ContentParet (parent, film) , _use_subtitles (false) , _burn_subtitles (false) , _subtitle_x_offset (0) @@ -109,8 +97,8 @@ SubtitleContent::SubtitleContent (shared_ptr<const Film> film, cxml::ConstNodePt connect_to_fonts (); } -SubtitleContent::SubtitleContent (shared_ptr<const Film> film, vector<shared_ptr<Content> > c) - : Content (film, c) +SubtitleContent::SubtitleContent (Content* parent, shared_ptr<const Film> film, vector<shared_ptr<Content> > c) + : ContentPart (parent, film) { shared_ptr<SubtitleContent> ref = dynamic_pointer_cast<SubtitleContent> (c[0]); DCPOMATIC_ASSERT (ref); |