4th parameter of time is ticks (1 tick = 4ms) not milliseconds

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 6e85a407a089ec117ac584fe38f6f4398ace2ea3..06edfc335d42ac52f0dd14307d0a3f7f7fbcb77d 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -24,27 +24,31 @@
  *  @brief An asset made up of WAV 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.
         *  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 mxf_path,
+               std::string directory,
+               std::string mxf_name,
                sigc::signal1<void, float>* progress,
                int fps,
                int length
@@ -53,7 +57,8 @@ public:
        /** Construct a SoundAsset, generating the MXF from the 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 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.
@@ -61,24 +66,45 @@ public:
         */
        SoundAsset (
                sigc::slot<std::string, Channel> get_path,
-               std::string mxf_path,
+               std::string directory,
+               std::string mxf_name,
                sigc::signal1<void, float>* progress,
                int fps,
                int length,
                int channels
                );
+
+       SoundAsset (
+               std::string directory,
+               std::string mxf_name,
+               int fps,
+               int length
+               );
        
        /** Write details of this asset to a CPL stream.
         *  @param s Stream.
         */
        void write_to_cpl (std::ostream& s) const;
 
+       std::list<std::string> equals (boost::shared_ptr<const Asset> other, EqualityOptions opt) 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 (sigc::slot<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;
 };
 
 }