Tidying.

[libdcp.git] / src / sound_frame.h

diff --git a/src/sound_frame.h b/src/sound_frame.h
index 5e9b136739a084501f82e50739049c8ee2ce785d..85082299e957c0c7b5aa1a721fc2543f7bb02d07 100644 (file)
--- a/src/sound_frame.h
+++ b/src/sound_frame.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,50 +15,53 @@
 
     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.
 */
 
+
 /** @file  src/sound_frame.h
- *  @brief SoundFrame class.
+ *  @brief SoundFrame class
  */
 
+
 #ifndef LIBDCP_SOUND_FRAME_H
 #define LIBDCP_SOUND_FRAME_H
 
-#include <boost/noncopyable.hpp>
-#include <boost/filesystem.hpp>
-#include <stdint.h>
-#include <string>
-
-namespace ASDCP {
-       namespace PCM {
-               class FrameBuffer;
-               class MXFReader;
-       }
-       class AESDecContext;
-}
+
+#include "frame.h"
+#include <asdcp/AS_DCP.h>
+
 
 namespace dcp {
 
-/** @class SoundFrame
- *  @brief One &lsquo;frame&rsquo; of sound data from a SoundAsset.
- */
-class SoundFrame : public boost::noncopyable
+
+class SoundFrame : public Frame<ASDCP::PCM::MXFReader, ASDCP::PCM::FrameBuffer>
 {
 public:
-       ~SoundFrame ();
-
-       uint8_t const * data () const;
-       int size () const;
+       SoundFrame (ASDCP::PCM::MXFReader* reader, int n, std::shared_ptr<const DecryptionContext> c);
+       int channels () const;
+       int samples () const;
+       int32_t get (int channel, int sample) const;
 
 private:
-       friend class SoundAssetReader;
-
-       SoundFrame (ASDCP::PCM::MXFReader* reader, int n, ASDCP::AESDecContext *);
-
-       /** a buffer to hold the frame */
-       ASDCP::PCM::FrameBuffer* _buffer;
+       int _channels = 0;
 };
 
+
 }
 
+
 #endif