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 73734f9fa67ce5a0ac4209ce19a8836343d2c34a..509ae559316bd800a9cde9da2e3f878bf54957e8 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/sound_asset.h
@@ -27,11 +41,12 @@
 #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 SoundAsset
@@ -40,10 +55,11 @@ class SoundAssetWriter;
 class SoundAsset : public Asset, public MXF
 {
 public:
-       SoundAsset (boost::filesystem::path file);
-       SoundAsset (Fraction edit_rate, int sampling_rate, int channels);
+       explicit SoundAsset (boost::filesystem::path file);
+       SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Standard standard);
 
-       boost::shared_ptr<SoundAssetWriter> start_write (boost::filesystem::path file, Standard standard);
+       boost::shared_ptr<SoundAssetWriter> start_write (boost::filesystem::path file);
+       boost::shared_ptr<SoundAssetReader> start_read () const;
 
        bool equals (
                boost::shared_ptr<const Asset> other,
@@ -51,8 +67,6 @@ public:
                NoteHandler note
                ) const;
 
-       boost::shared_ptr<const SoundFrame> get_frame (int n) const;
-
        /** @return number of channels */
        int channels () const {
                return _channels;
@@ -72,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