diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-01-17 21:42:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-01-17 21:42:43 +0000 |
| commit | 039ac5848730d154e0b3f3dd841a55e45ba922d8 (patch) | |
| tree | 905e5121f749b016815ead3f95140cdf0b22e002 /src/lib/dcp_video_frame.h | |
| parent | d42989d447bc9199b670d8e99fbb8b93f06ddb71 (diff) | |
| parent | 72494dd766159e9bdac5d80479b43eb1b3ca15b2 (diff) | |
Merge writer-thread with original which was time-cleanup.
Diffstat (limited to 'src/lib/dcp_video_frame.h')
| -rw-r--r-- | src/lib/dcp_video_frame.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/lib/dcp_video_frame.h b/src/lib/dcp_video_frame.h index 4271ebb28..e311724d8 100644 --- a/src/lib/dcp_video_frame.h +++ b/src/lib/dcp_video_frame.h @@ -39,15 +39,11 @@ class Subtitle; class EncodedData { public: - /** @param d Data (will not be freed by this class, but may be by subclasses) - * @param s Size of data, in bytes. + /** @param s Size of data, in bytes. */ - EncodedData (uint8_t* d, int s) - : _data (d) - , _size (s) - {} + EncodedData (int s); - virtual ~EncodedData () {} + virtual ~EncodedData (); void send (boost::shared_ptr<Socket> socket); void write (boost::shared_ptr<const Film>, int); @@ -65,6 +61,10 @@ public: protected: uint8_t* _data; ///< data int _size; ///< data size in bytes + +private: + /* No copy construction */ + EncodedData (EncodedData const &); }; /** @class LocallyEncodedData @@ -75,12 +75,10 @@ protected: class LocallyEncodedData : public EncodedData { public: - /** @param d Data (which will not be freed by this class) + /** @param d Data (which will be copied by this class) * @param s Size of data, in bytes. */ - LocallyEncodedData (uint8_t* d, int s) - : EncodedData (d, s) - {} + LocallyEncodedData (uint8_t* d, int s); }; /** @class RemotelyEncodedData @@ -91,7 +89,6 @@ class RemotelyEncodedData : public EncodedData { public: RemotelyEncodedData (int s); - ~RemotelyEncodedData (); }; /** @class DCPVideoFrame |