X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.h;h=717aab82b809eb77ef2671dd21dd858a5c1d5911;hb=refs%2Ftags%2Fv1.8.63;hp=eb357b37a8e8070daed225689fc6b0becb51b676;hpb=5591a50b918d2dc784a9e15688dfe24eb2b6dfcc;p=libdcp.git

diff --git a/src/sound_asset.h b/src/sound_asset.h
index eb357b37..717aab82 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,25 +15,56 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
+
 /** @file  src/sound_asset.h
  *  @brief SoundAsset class
  */
 
+
 #ifndef LIBDCP_SOUND_ASSET_H
 #define LIBDCP_SOUND_ASSET_H
 
+
 #include "mxf.h"
 #include "types.h"
+#include "language_tag.h"
 #include "metadata.h"
+#include "sound_frame.h"
+#include "sound_asset_reader.h"
+
+
+namespace dcp {
+	class SoundAsset;
+}
+
+
+extern std::shared_ptr<dcp::SoundAsset> simple_sound (
+	boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate, boost::optional<dcp::Key>, int channels
+	);
+
 
 namespace dcp
 {
 
-class SoundFrame;
+
 class SoundAssetWriter;
-class SoundAssetReader;
+
 
 /** @class SoundAsset
  *  @brief Representation of a sound asset
@@ -42,16 +73,16 @@ class SoundAsset : public Asset, public MXF
 {
 public:
 	explicit SoundAsset (boost::filesystem::path file);
-	SoundAsset (Fraction edit_rate, int sampling_rate, int channels);
+	SoundAsset (Fraction edit_rate, int sampling_rate, int channels, LanguageTag language, Standard standard);
 
-	boost::shared_ptr<SoundAssetWriter> start_write (boost::filesystem::path file, Standard standard);
-	boost::shared_ptr<SoundAssetReader> start_read () const;
+	std::shared_ptr<SoundAssetWriter> start_write (boost::filesystem::path file, bool atmos_sync = false);
+	std::shared_ptr<SoundAssetReader> start_read () const;
 
 	bool equals (
-		boost::shared_ptr<const Asset> other,
+		std::shared_ptr<const Asset> other,
 		EqualityOptions opt,
 		NoteHandler note
-		) const;
+		) const override;
 
 	/** @return number of channels */
 	int channels () const {
@@ -71,22 +102,35 @@ public:
 		return _intrinsic_duration;
 	}
 
+	boost::optional<std::string> language () const {
+		return _language;
+	}
+
 	static bool valid_mxf (boost::filesystem::path);
+	static std::string static_pkl_type (Standard standard);
 
 private:
 	friend class SoundAssetWriter;
+	friend std::shared_ptr<dcp::SoundAsset> (::simple_sound) (
+		boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate, boost::optional<dcp::Key>, int channels
+		);
 
-	std::string pkl_type (Standard standard) const;
+	std::string pkl_type (Standard standard) const override {
+		return static_pkl_type (standard);
+	}
 
 	Fraction _edit_rate;
 	/** The total length of this content in video frames.  The amount of
 	 *  content presented may be less than this.
 	 */
-	int64_t _intrinsic_duration;
-	int _channels;      ///< number of channels
-	int _sampling_rate; ///< sampling rate in Hz
+	int64_t _intrinsic_duration = 0;
+	int _channels = 0;      ///< number of channels
+	int _sampling_rate = 0; ///< sampling rate in Hz
+	boost::optional<std::string> _language;
 };
 
+
 }
 
+
 #endif