Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index c63bab90ccd391f49a7aeab8bb1d98c5176b0097..3189c0674471d08141bbb45d4e301155dc38936f 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -17,33 +17,97 @@
 
 */
 
+#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"
 
 namespace libdcp
 {
 
+class SoundFrame;      
+
 /** @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.
+        */
+       SoundAsset (
+               std::vector<std::string> const & files,
+               std::string directory,
+               std::string mxf_name,
+               boost::signals2::signal<void (float)>* progress,
+               int fps,
+               int length
+               );
+
+       /** 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 length Length in frames.
+        *  @param channels Number of audio channels.
         */
-       SoundAsset (std::list<std::string> const & files, std::string mxf_path, sigc::signal1<void, float>* progress, int fps, int length);
+       SoundAsset (
+               boost::function<std::string (Channel)> get_path,
+               std::string directory,
+               std::string mxf_name,
+               boost::signals2::signal<void (float)>* progress,
+               int fps,
+               int length,
+               int channels
+               );
 
+       SoundAsset (
+               std::string directory,
+               std::string mxf_name,
+               int fps,
+               int entry_point,
+               int length
+               );
+       
        /** 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, std::list<std::string>& notes) 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);
+       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