X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.h;h=968f7dded8033ee474f308199bb60afefba8b6d5;hb=660f1059c3b2c1ee08cd390cf6d5a0b5900a7edc;hp=cf015c30cfccdf3aed1b6c4bf5c56f74ad68a1a5;hpb=827901db3d834465b1121c9f8041b9faf4923ec9;p=libdcp.git

diff --git a/src/sound_asset.h b/src/sound_asset.h
index cf015c30..968f7dde 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -17,144 +17,72 @@
 
 */
 
-#ifndef LIBDCP_SOUND_ASSET_H
-#define LIBDCP_SOUND_ASSET_H
-
 /** @file  src/sound_asset.h
- *  @brief An asset made up of PCM audio data files
+ *  @brief SoundAsset class
  */
 
-#include "mxf_asset.h"
+#ifndef LIBDCP_SOUND_ASSET_H
+#define LIBDCP_SOUND_ASSET_H
+
+#include "mxf.h"
 #include "types.h"
 #include "metadata.h"
 
-namespace libdcp
+namespace dcp
 {
 
 class SoundFrame;
-class SoundAsset;
+class SoundAssetWriter;
 
-class SoundAssetWriter
+/** @class SoundAsset
+ *  @brief Representation of a sound asset
+ */
+class SoundAsset : public Asset, public MXF
 {
 public:
-	void write (float const * const *, int);
-	void finalize ();
+	SoundAsset (boost::filesystem::path file);
+	SoundAsset (Fraction edit_rate, int sampling_rate, int channels);
 
-private:
-	friend class SoundAsset;
-
-	SoundAssetWriter (SoundAsset *, bool interop, MXFMetadata const &);
-
-	/* no copy construction */
-	SoundAssetWriter (SoundAssetWriter const &);
-	SoundAssetWriter& operator= (SoundAssetWriter const &);
-	
-	void write_current_frame ();
-
-	/* do this with an opaque pointer so we don't have to include
-	   ASDCP headers
-	*/
-	   
-	struct ASDCPState;
-	boost::shared_ptr<ASDCPState> _state;
-
-	SoundAsset* _asset;
-	bool _finalized;
-	int _frames_written;
-	int _frame_buffer_offset;
-	MXFMetadata _metadata;
-};
+	boost::shared_ptr<SoundAssetWriter> start_write (boost::filesystem::path file, Standard standard);
 
-/** @brief An asset made up of WAV files */
-class SoundAsset : public MXFAsset
-{
-public:
-	/** Construct a SoundAsset, generating the MXF from some WAV files.
-	 *  This may take some time; progress is indicated by emission of the Progress signal.
-	 *  @param files Pathnames of sound files, in the order Left, Right, Centre, Lfe (sub), Left surround, Right surround.
-	 *  @param directory Directory in which to create MXF file.
-	 *  @param mxf_name Name of MXF file to create.
-	 *  @param progress Signal to inform of progress.
-	 *  @param fps Frames per second.
-	 *  @param length Length in frames.
-	 *  @param start_frame Frame in the source to start writing from.
-	 *  @param intrinsic_duration Length of the whole asset in frames.
-	 *  @param encrypted true if asset should be encrypted.
-	 *  Note that this is different to entry_point in that the asset will contain no data before start_frame.
-	 */
-	SoundAsset (
-		std::vector<std::string> const & files,
-		std::string directory,
-		std::string mxf_name,
-		boost::signals2::signal<void (float)>* progress,
-		int fps,
-		int intrinsic_duration,
-		bool encrypted,
-		bool interop,
-		MXFMetadata const & metadata = MXFMetadata ()
-		);
-
-	/** Construct a SoundAsset, generating the MXF from some WAV files.
-	 *  This may take some time; progress is indicated by emission of the Progress signal.
-	 *  @param get_path Functor which returns a WAV file path for a given channel.
-	 *  @param directory Directory in which to create MXF file.
-	 *  @param mxf_name Name of MXF file to create.
-	 *  @param progress Signal to inform of progress.
-	 *  @param fps Frames per second.
-	 *  @param intrinsic_duration Length of the whole asset in frames.
-	 *  @param channels Number of audio channels.
-	 *  @param encrypted true if asset should be encrypted.
-	 */
-	SoundAsset (
-		boost::function<std::string (Channel)> get_path,
-		std::string directory,
-		std::string mxf_name,
-		boost::signals2::signal<void (float)>* progress,
-		int fps,
-		int intrinsic_duration,
-		int channels,
-		bool encrypted,
-		bool interop,
-		MXFMetadata const & metadata = MXFMetadata ()
-		);
-
-	SoundAsset (
-		std::string directory,
-		std::string mxf_name
-		);
-
-	SoundAsset (
-		std::string directory,
-		std::string mxf_name,
-		int fps,
-		int channels,
-		int sampling_rate,
-		bool encrypted
-		);
-
-	boost::shared_ptr<SoundAssetWriter> start_write (bool, MXFMetadata const & metadata = MXFMetadata ());
-	
-	bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
+	bool equals (
+		boost::shared_ptr<const Asset> other,
+		EqualityOptions opt,
+		NoteHandler note
+		) const;
 
 	boost::shared_ptr<const SoundFrame> get_frame (int n) const;
-	
+
+	/** @return number of channels */
 	int channels () const {
 		return _channels;
 	}
 
+	/** @return sampling rate in Hz */
 	int sampling_rate () const {
 		return _sampling_rate;
 	}
 
+	Fraction edit_rate () const {
+		return _edit_rate;
+	}
+
+	int64_t intrinsic_duration () const {
+		return _intrinsic_duration;
+	}
+
 private:
-	std::string key_type () const;
-	void construct (boost::function<std::string (Channel)> get_path, bool interop, MXFMetadata const &);
-	std::string path_from_channel (Channel channel, std::vector<std::string> const & files);
-	std::string cpl_node_name () const;
-
-	/** Number of channels in the asset */
-	int _channels;
-	int _sampling_rate;
+	friend class SoundAssetWriter;
+
+	std::string pkl_type (Standard standard) const;
+
+	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
 };
 
 }