Tidy up a bit; vertical white space, group metadata together,

[libdcp.git] / src / sound_asset_reader.h

diff --git a/src/sound_asset_reader.h b/src/sound_asset_reader.h
index 5012168617e2ee371825b87ce60f3b41acae5aeb..8ec4e59f0306bc848194dab6cde69e8df1207516 100644 (file)
--- a/src/sound_asset_reader.h
+++ b/src/sound_asset_reader.h
@@ -1,48 +1,41 @@
 /*
     Copyright (C) 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.
 */
 
 #include "asset_reader.h"
-#include <boost/shared_ptr.hpp>
-
-namespace ASDCP {
-       namespace PCM {
-               class MXFReader;
-       }
-}
+#include "sound_frame.h"
 
 namespace dcp {
 
-class SoundFrame;
-class SoundAsset;
-
-class SoundAssetReader : public AssetReader
-{
-public:
-       ~SoundAssetReader ();
-       boost::shared_ptr<const SoundFrame> get_frame (int n) const;
-
-private:
-       friend class SoundAsset;
-
-       SoundAssetReader (SoundAsset const * asset);
-
-       ASDCP::PCM::MXFReader* _reader;
-};
+typedef AssetReader<ASDCP::PCM::MXFReader, SoundFrame> SoundAssetReader;
 
 }