Fix erroneous reports of unresolved assets when checking OV/VF pairs.

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index b3e5fec3cf6f689afa13163b9d510a7f97e7ad6b..509ae559316bd800a9cde9da2e3f878bf54957e8 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -41,13 +41,13 @@
 #include "mxf.h"
 #include "types.h"
 #include "metadata.h"
+#include "sound_frame.h"
+#include "sound_asset_reader.h"
 
 namespace dcp
 {
 
-class SoundFrame;
 class SoundAssetWriter;
-class SoundAssetReader;
 
 /** @class SoundAsset
  *  @brief Representation of a sound asset
@@ -56,9 +56,9 @@ class SoundAsset : public Asset, public MXF
 {
 public:
        explicit SoundAsset (boost::filesystem::path file);
-       SoundAsset (Fraction edit_rate, int sampling_rate, int channels);
+       SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Standard standard);
 
-       boost::shared_ptr<SoundAssetWriter> start_write (boost::filesystem::path file, Standard standard, ChannelAssignment assign);
+       boost::shared_ptr<SoundAssetWriter> start_write (boost::filesystem::path file);
        boost::shared_ptr<SoundAssetReader> start_read () const;
 
        bool equals (
@@ -86,11 +86,14 @@ public:
        }
 
        static bool valid_mxf (boost::filesystem::path);
+       static std::string static_pkl_type (Standard standard);
 
 private:
        friend class SoundAssetWriter;
 
-       std::string pkl_type (Standard standard) const;
+       std::string pkl_type (Standard standard) const {
+               return static_pkl_type (standard);
+       }
 
        Fraction _edit_rate;
        /** The total length of this content in video frames.  The amount of