summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-04 21:18:54 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-05 14:34:44 +0100
commit3fd8e16705b3eb4dc08cf9f33a489418b069b90a (patch)
tree901855547ef0ffcfaeb90b8b8cde4c1755377192 /src
parentbb5faa34a893dcec91329d6856335e050cf8357c (diff)
Make fill_writer_info protected.
Diffstat (limited to 'src')
-rw-r--r--src/mxf.h19
1 files changed, 10 insertions, 9 deletions
diff --git a/src/mxf.h b/src/mxf.h
index 068b6036..9c5b095a 100644
--- a/src/mxf.h
+++ b/src/mxf.h
@@ -39,7 +39,8 @@ namespace ASDCP {
namespace dcp
{
-class MXFMetadata;
+class MXFMetadata;
+class PictureMXFWriter;
/** @class MXF
* @brief Parent class for classes which represent MXF files.
@@ -57,12 +58,6 @@ public:
NoteHandler note
) const;
- /** Fill in a ADSCP::WriteInfo struct.
- * @param w struct to fill in.
- * @param standard INTEROP or SMPTE.
- */
- void fill_writer_info (ASDCP::WriterInfo* w, Standard standard);
-
/** @return true if the data is encrypted */
bool encrypted () const {
return !_key_id.empty ();
@@ -105,10 +100,16 @@ public:
}
protected:
- friend class MXFWriter;
+ template <class P, class Q>
+ friend void start (PictureMXFWriter* writer, boost::shared_ptr<P> state, Standard standard, Q* mxf, uint8_t* data, int size);
void read_writer_info (ASDCP::WriterInfo const &);
-
+ /** Fill in a ADSCP::WriteInfo struct.
+ * @param w struct to fill in.
+ * @param standard INTEROP or SMPTE.
+ */
+ void fill_writer_info (ASDCP::WriterInfo* w, Standard standard);
+
ASDCP::AESEncContext* _encryption_context;
ASDCP::AESDecContext* _decryption_context;
/** ID of the key used for encryption/decryption, or an empty string */