From 3fd8e16705b3eb4dc08cf9f33a489418b069b90a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 4 Jun 2015 21:18:54 +0100 Subject: Make fill_writer_info protected. --- src/mxf.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'src') 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 + friend void start (PictureMXFWriter* writer, boost::shared_ptr

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 */ -- cgit v1.2.3