X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Faudio_content.h;h=e196e15c208e6573441c8c3de736c1d31089e4a3;hb=cc76b517f6a74f813ae38137bdc88ff3bafa6dd9;hp=2ecb512055cb5836590a32a706d4be0d1a4711bb;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index 2ecb51205..e196e15c2 100644
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 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
@@ -24,68 +24,74 @@
 #ifndef DCPOMATIC_AUDIO_CONTENT_H
 #define DCPOMATIC_AUDIO_CONTENT_H
 
-#include "content.h"
+#include "content_part.h"
 #include "audio_stream.h"
 #include "audio_mapping.h"
 
-namespace cxml {
-	class Node;
-}
-
 /** @class AudioContentProperty
  *  @brief Names for properties of AudioContent.
  */
 class AudioContentProperty
 {
 public:
-	static int const AUDIO_STREAMS;
-	static int const AUDIO_GAIN;
-	static int const AUDIO_DELAY;
+	static int const STREAMS;
+	static int const GAIN;
+	static int const DELAY;
 };
 
-/** @class AudioContent
- *  @brief Parent class for content which may contain audio data.
- */
-class AudioContent : public virtual Content
+class AudioContent : public ContentPart
 {
 public:
-	AudioContent (boost::shared_ptr<const Film>);
-	AudioContent (boost::shared_ptr<const Film>, DCPTime);
-	AudioContent (boost::shared_ptr<const Film>, boost::filesystem::path);
-	AudioContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr);
-	AudioContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
+	AudioContent (Content* parent, boost::shared_ptr<const Film>);
+	AudioContent (Content* parent, boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
 	std::string technical_summary () const;
 
-	virtual std::vector<AudioStreamPtr> audio_streams () const = 0;
-
-	AudioMapping audio_mapping () const;
-	void set_audio_mapping (AudioMapping);
-	int resampled_audio_frame_rate () const;
+	AudioMapping mapping () const;
+	void set_mapping (AudioMapping);
+	int resampled_frame_rate () const;
 	bool has_rate_above_48k () const;
-	std::vector<std::string> audio_channel_names () const;
+	std::vector<std::string> 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;
 	}
 
 	std::string processing_description () const;
 
+	std::vector<AudioStreamPtr> streams () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _streams;
+	}
+
+	void add_stream (AudioStreamPtr stream);
+	void set_stream (AudioStreamPtr stream);
+	void set_streams (std::vector<AudioStreamPtr> streams);
+	AudioStreamPtr stream () const;
+
+	void add_properties (std::list<UserProperty> &) const;
+
+	static boost::shared_ptr<AudioContent> from_xml (Content* parent, boost::shared_ptr<const Film>, cxml::ConstNodePtr);
+
 private:
+
+	AudioContent (Content* parent, boost::shared_ptr<const Film>, 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;
+	int _delay;
+	std::vector<AudioStreamPtr> _streams;
 };
 
 #endif