Add common_name().

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index e13c502858b5b07de840a138cf0a3b0d9d77f142..d41b72d5f995adc3862529f97bfa735be606d743 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -26,19 +26,17 @@
 
 #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 ();
 
@@ -70,73 +68,21 @@ private:
 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 intrinsic_duration Length of the whole asset in frames.
-        *  @param start_frame Frame in the source to start writing from.
-        *  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,
-               int start_frame
-               );
-
-       /** 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 start_frame Frame in the source to start writing from.
-        *  Note that this is different to entry_point in that the asset will contain no data before start_frame.
-        *  @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 start_frame,
-               int channels
-               );
-
-       SoundAsset (
-               std::string directory,
-               std::string mxf_name
-               );
-
-       SoundAsset (
-               std::string directory,
-               std::string mxf_name,
-               int fps,
-               int channels,
-               int sampling_rate
-               );
+       SoundAsset (boost::filesystem::path directory, std::string mxf_name);
+
+       void read ();
+       void create (std::vector<boost::filesystem::path> const & files);
+       void create (boost::function<boost::filesystem::path (Channel)> get_path);
 
        boost::shared_ptr<SoundAssetWriter> start_write ();
        
-       /** 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;
+       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;
+
+       void set_channels (int c) {
+               _channels = c;
+       }
        
        int channels () const {
                return _channels;
@@ -147,13 +93,14 @@ public:
        }
 
 private:
-       void construct (boost::function<std::string (Channel)> get_path);
-       std::string path_from_channel (Channel channel, std::vector<std::string> const & files);
+       std::string key_type () const;
+       void construct (boost::function<boost::filesystem::path (Channel)> get_path);
+       boost::filesystem::path path_from_channel (Channel channel, std::vector<boost::filesystem::path> const & files);
+       std::string cpl_node_name () const;
 
        /** Number of channels in the asset */
        int _channels;
        int _sampling_rate;
-       int _start_frame;
 };
 
 }