X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.h;h=774210c13ff191eb37521b6be328a110d79035d1;hb=bd12a72f78409e3f482be3d47b5efb57af4ad982;hp=7d24b30ff166c770a1d1a52a162ddd2c6d63b2da;hpb=29fe2d3a4c347e15b987f9e61e56d22a21d4678f;p=dcpomatic.git

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index 7d24b30ff..774210c13 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -50,12 +51,13 @@ public:
 class VideoContent : public ContentPart, public boost::enable_shared_from_this<VideoContent>
 {
 public:
-	VideoContent (Content* parent);
+	explicit VideoContent (Content* parent);
 	VideoContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
 	std::string identifier () const;
+	void take_settings_from (boost::shared_ptr<const VideoContent> c);
 
 	Frame length () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -166,6 +168,9 @@ public:
 	void take_from_examiner (boost::shared_ptr<VideoExaminer>);
 	void add_properties (std::list<UserProperty> &) const;
 
+	void modify_position (DCPTime& pos) const;
+	void modify_trim_start (ContentTime& pos) const;
+
 	static boost::shared_ptr<VideoContent> from_xml (Content* parent, cxml::ConstNodePtr, int);
 
 private: