X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=504c2aecfffde3b2719eff1789babcd3639a010a;hp=cfce3fb835c5ae75c52a6b63a011c5d4ecdf7458;hb=5eb8b5c3a1566aef638e9d9df03b88d320735092;hpb=8008b81c0ccee843263e2a648707b71cc3ae081f

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index cfce3fb83..504c2aecf 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_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/>.
 
 */
 
@@ -37,23 +38,21 @@ public:
 	static int const STREAMS;
 	static int const GAIN;
 	static int const DELAY;
-	static int const VIDEO_FRAME_RATE;
 };
 
 class AudioContent : public ContentPart
 {
 public:
-	AudioContent (Content* parent, boost::shared_ptr<const Film>);
-	AudioContent (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
-	AudioContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
+	explicit AudioContent (Content* parent);
+	AudioContent (Content* parent, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
+	void take_settings_from (boost::shared_ptr<const AudioContent> c);
 
 	AudioMapping mapping () const;
 	void set_mapping (AudioMapping);
-	int resampled_frame_rate () const;
-	bool has_rate_above_48k () const;
+	int resampled_frame_rate (boost::shared_ptr<const Film> film) const;
 	std::vector<std::string> channel_names () const;
 
 	void set_gain (double);
@@ -69,10 +68,7 @@ public:
 		return _delay;
 	}
 
-	double video_frame_rate () const;
-	void set_video_frame_rate (double r);
-
-	std::string processing_description () const;
+	std::string processing_description (boost::shared_ptr<const Film> film) const;
 
 	std::vector<AudioStreamPtr> streams () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -84,15 +80,21 @@ public:
 	void set_streams (std::vector<AudioStreamPtr> streams);
 	AudioStreamPtr stream () const;
 
-	void add_properties (std::list<UserProperty> &) const;
+	void add_properties (boost::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+
+	void modify_position (boost::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+	void modify_trim_start (dcpomatic::ContentTime& pos) const;
+
+	static boost::shared_ptr<AudioContent> from_xml (Content* parent, cxml::ConstNodePtr, int version);
 
 private:
 
+	AudioContent (Content* parent, cxml::ConstNodePtr);
+
 	/** Gain to apply to audio in dB */
 	double _gain;
 	/** Delay to apply to audio (positive moves audio later) in milliseconds */
 	int _delay;
-	boost::optional<double> _video_frame_rate;
 	std::vector<AudioStreamPtr> _streams;
 };