X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=83a5e327e87c02c0da9f98d987269bd858e72f6d;hb=444809fb888ed99803f2d19c94d3faef067cf348;hp=3aa9678b01119f5e3499ea94bc7c83e5ca103376;hpb=65b331d32c383f3a9049f29bf03ab3fe3193b31a;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 3aa9678b0..83a5e327e 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/>.
 
 */
 
@@ -34,45 +35,40 @@
 class AudioContentProperty
 {
 public:
-	static int const AUDIO_STREAMS;
-	static int const AUDIO_GAIN;
-	static int const AUDIO_DELAY;
-	static int const AUDIO_VIDEO_FRAME_RATE;
+	static int const STREAMS;
+	static int const GAIN;
+	static int const DELAY;
 };
 
 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<std::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
+	void take_settings_from (std::shared_ptr<const AudioContent> c);
 
-	AudioMapping audio_mapping () const;
-	void set_audio_mapping (AudioMapping);
-	int resampled_audio_frame_rate () const;
-	bool has_rate_above_48k () const;
-	std::vector<std::string> audio_channel_names () const;
+	AudioMapping mapping () const;
+	void set_mapping (AudioMapping);
+	int resampled_frame_rate (std::shared_ptr<const Film> film) const;
+	std::vector<NamedChannel> channel_names () const;
 
-	void set_audio_gain (double);
-	void set_audio_delay (int);
+	void set_gain (double);
+	void set_delay (int);
 
-	double audio_gain () const {
+	double gain () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_gain;
+		return _gain;
 	}
 
-	int audio_delay () const {
+	int delay () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_delay;
+		return _delay;
 	}
 
-	double audio_video_frame_rate () const;
-	void set_audio_video_frame_rate (double r);
-
-	std::string processing_description () const;
+	std::string processing_description (std::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 (std::shared_ptr<const Film> film, std::list<UserProperty> &) const;
+
+	void modify_position (std::shared_ptr<const Film> film, dcpomatic::DCPTime& pos) const;
+	void modify_trim_start (dcpomatic::ContentTime& pos) const;
+
+	static std::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 _audio_gain;
+	double _gain;
 	/** Delay to apply to audio (positive moves audio later) in milliseconds */
-	int _audio_delay;
-	boost::optional<double> _audio_video_frame_rate;
+	int _delay;
 	std::vector<AudioStreamPtr> _streams;
 };