namespace libdcp -> dcp.

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 5c230e06848805ab114bc032a734a32983d78d54..f33e5aec12c60dadd9b702dcf10af807f2384c6c 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -28,7 +28,7 @@
 #include "types.h"
 #include "metadata.h"
 
-namespace libdcp
+namespace dcp
 {
 
 class SoundFrame;
@@ -37,15 +37,13 @@ class SoundAsset;
 class SoundAssetWriter
 {
 public:
-       ~SoundAssetWriter ();
-
        void write (float const * const *, int);
        void finalize ();
 
 private:
        friend class SoundAsset;
 
-       SoundAssetWriter (SoundAsset *, MXFMetadata const &);
+       SoundAssetWriter (SoundAsset *);
 
        /* no copy construction */
        SoundAssetWriter (SoundAssetWriter const &);
@@ -64,89 +62,61 @@ private:
        bool _finalized;
        int _frames_written;
        int _frame_buffer_offset;
-       MXFMetadata _metadata;
 };
 
 /** @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 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::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::filesystem::path directory, boost::filesystem::path mxf_name);
+
+       void read ();
+
+       /** The following parameters must be set up (if required) before calling this:
+        *      Interop mode (set_interop)
+        *      Edit rate    (set_edit_rate)
+        *      MXF Metadata (set_metadata)
+        *      Channels     (set_channels)
+        *      Intrinsic duration (set_intrinsic_duration)
         */
-       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 create (std::vector<boost::filesystem::path> const & files);
+
+       /** The following parameters must be set up (if required) before calling this:
+        *      Interop mode (set_interop)
+        *      Edit rate    (set_edit_rate)
+        *      MXF Metadata (set_metadata)
+        *      Channels     (set_channels)
+        *      Intrinsic duration (set_intrinsic_duration)
         */
-       void write_to_cpl (std::ostream& s) const;
+       void create (boost::function<boost::filesystem::path (Channel)> get_path);
 
+       boost::shared_ptr<SoundAssetWriter> start_write ();
+       
        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;
        }
 
+       void set_sampling_rate (int s) {
+               _sampling_rate = s;
+       }
+
        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);
+       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;