X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.h;h=5c230e06848805ab114bc032a734a32983d78d54;hb=1368dfded40e5a774a73e2256e214bcaf4e74866;hp=c63bab90ccd391f49a7aeab8bb1d98c5176b0097;hpb=82d22d7ff5328fae4f2e3048e63a2b11f3ce36b4;p=libdcp.git

diff --git a/src/sound_asset.h b/src/sound_asset.h
index c63bab90..5c230e06 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -17,33 +17,142 @@
 
 */
 
+#ifndef LIBDCP_SOUND_ASSET_H
+#define LIBDCP_SOUND_ASSET_H
+
 /** @file  src/sound_asset.h
- *  @brief An asset made up of WAV files
+ *  @brief An asset made up of PCM audio data files
  */
 
-#include "asset.h"
+#include "mxf_asset.h"
+#include "types.h"
+#include "metadata.h"
 
 namespace libdcp
 {
 
+class SoundFrame;
+class SoundAsset;
+
+class SoundAssetWriter
+{
+public:
+	~SoundAssetWriter ();
+
+	void write (float const * const *, int);
+	void finalize ();
+
+private:
+	friend class SoundAsset;
+
+	SoundAssetWriter (SoundAsset *, 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;
+};
+
 /** @brief An asset made up of WAV files */
-class SoundAsset : public Asset
+class SoundAsset : public MXFAsset
 {
 public:
-	/** Construct a SoundAsset, generating the MXF from the WAV files.
+	/** 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 mxf_path Pathname of MXF file to create.
+	 *  @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 intrinsic_duration Length of the whole asset in frames.
+	 *  Note that this is different to entry_point in that the asset will contain no data before start_frame.
 	 */
-	SoundAsset (std::list<std::string> const & files, std::string mxf_path, sigc::signal1<void, float>* progress, int fps, int length);
+	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,
+		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.
+	 */
+	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,
+		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
+		);
+
+	boost::shared_ptr<SoundAssetWriter> start_write (MXFMetadata const & metadata = MXFMetadata ());
+	
 	/** Write details of this asset to a CPL stream.
 	 *  @param s Stream.
 	 */
 	void write_to_cpl (std::ostream& s) const;
+
+	bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
+
+	boost::shared_ptr<const SoundFrame> get_frame (int n) const;
+	
+	int channels () const {
+		return _channels;
+	}
+
+	int sampling_rate () const {
+		return _sampling_rate;
+	}
+
+private:
+	void construct (boost::function<std::string (Channel)> get_path, MXFMetadata const &);
+	std::string path_from_channel (Channel channel, std::vector<std::string> const & files);
+
+	/** Number of channels in the asset */
+	int _channels;
+	int _sampling_rate;
 };
 
 }
+
+#endif