Some compilers don't like x = {} where x is a boost::optional<string>

[libdcp.git] / src / sound_asset_reader.h

diff --git a/src/sound_asset_reader.h b/src/sound_asset_reader.h
index a9a05eb314f6467d173a825c91dde559b483dae4..e07150404efc9becbcb0327761b1924ba259e507 100644 (file)
--- a/src/sound_asset_reader.h
+++ b/src/sound_asset_reader.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,34 +15,36 @@
 
     You should have received a copy of the GNU General Public License
     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.
 */
 
-#include "asset_reader.h"
-#include <boost/shared_ptr.hpp>
 
-namespace ASDCP {
-       namespace PCM {
-               class MXFReader;
-       }
-}
+/** @file  src/sound_asset_reader.h
+ *  @brief SoundAssetReader typedef
+ */
 
-namespace dcp {
 
-class SoundFrame;
-class SoundAsset;
+#include "asset_reader.h"
+#include "sound_frame.h"
+
 
-class SoundAssetReader : public AssetReader
-{
-public:
-       ~SoundAssetReader ();
-       boost::shared_ptr<const SoundFrame> get_frame (int n) const;
+namespace dcp {
 
-private:
-       friend class SoundAsset;
 
-       SoundAssetReader (SoundAsset const * asset);
+typedef AssetReader<ASDCP::PCM::MXFReader, SoundFrame> SoundAssetReader;
 
-       ASDCP::PCM::MXFReader* _reader;
-};
 
 }