Fix tests again on Windows.

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index e58773e4c90adc7a35309a75dc6d3beefc05aac2..717aab82b809eb77ef2671dd21dd858a5c1d5911 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -55,7 +55,7 @@ namespace dcp {
 
 
 extern std::shared_ptr<dcp::SoundAsset> simple_sound (
-       boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate
+       boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate, boost::optional<dcp::Key>, int channels
        );
 
 
@@ -82,7 +82,7 @@ public:
                std::shared_ptr<const Asset> other,
                EqualityOptions opt,
                NoteHandler note
-               ) const;
+               ) const override;
 
        /** @return number of channels */
        int channels () const {
@@ -102,7 +102,7 @@ public:
                return _intrinsic_duration;
        }
 
-       std::string language () const {
+       boost::optional<std::string> language () const {
                return _language;
        }
 
@@ -112,10 +112,10 @@ public:
 private:
        friend class SoundAssetWriter;
        friend std::shared_ptr<dcp::SoundAsset> (::simple_sound) (
-               boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate
+               boost::filesystem::path path, std::string suffix, dcp::MXFMetadata mxf_meta, std::string language, int frames, int sample_rate, boost::optional<dcp::Key>, int channels
                );
 
-       std::string pkl_type (Standard standard) const {
+       std::string pkl_type (Standard standard) const override {
                return static_pkl_type (standard);
        }
 
@@ -126,7 +126,7 @@ private:
        int64_t _intrinsic_duration = 0;
        int _channels = 0;      ///< number of channels
        int _sampling_rate = 0; ///< sampling rate in Hz
-       std::string _language;
+       boost::optional<std::string> _language;
 };