diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-07-23 20:48:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-07-23 20:48:52 +0100 |
| commit | 9d44777aac1f0ae239b123a1819a0f2f11d07c56 (patch) | |
| tree | fcc008f7b12f0dd7f0ae5ccbb4e6c30b91b2d0f1 /src | |
| parent | dddaa7abf05f182246a5b7d9b6ebc64c25d4bd86 (diff) | |
Revert "Renaming to try to fix windows confusion."
This reverts commit dddaa7abf05f182246a5b7d9b6ebc64c25d4bd86.
Diffstat (limited to 'src')
| -rw-r--r-- | src/picture_asset_writer.cc | 12 | ||||
| -rw-r--r-- | src/picture_asset_writer.h | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc index b5ced760..8ac76c9c 100644 --- a/src/picture_asset_writer.cc +++ b/src/picture_asset_writer.cc @@ -52,9 +52,9 @@ PictureAssetWriter::PictureAssetWriter (PictureAsset* asset, bool overwrite, MXF } -struct ASDCPState +struct ASDCPStateBase { - ASDCPState () + ASDCPStateBase () : frame_buffer (4 * Kumu::Megabyte) {} @@ -64,12 +64,12 @@ struct ASDCPState ASDCP::JP2K::PictureDescriptor picture_descriptor; }; -struct MonoPictureAssetWriter::MonoASDCPState : public ASDCPState +struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase { ASDCP::JP2K::MXFWriter mxf_writer; }; -struct StereoPictureAssetWriter::StereoASDCPState : public ASDCPState +struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase { ASDCP::JP2K::MXFSWriter mxf_writer; }; @@ -79,14 +79,14 @@ struct StereoPictureAssetWriter::StereoASDCPState : public ASDCPState */ MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, bool overwrite, MXFMetadata const & metadata) : PictureAssetWriter (asset, overwrite, metadata) - , _state (new MonoPictureAssetWriter::MonoASDCPState) + , _state (new MonoPictureAssetWriter::ASDCPState) { } StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* asset, bool overwrite, MXFMetadata const & metadata) : PictureAssetWriter (asset, overwrite, metadata) - , _state (new StereoPictureAssetWriter::StereoASDCPState) + , _state (new StereoPictureAssetWriter::ASDCPState) , _next_eye (EYE_LEFT) { diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h index 6f33d3b6..a0f0bdc8 100644 --- a/src/picture_asset_writer.h +++ b/src/picture_asset_writer.h @@ -101,8 +101,8 @@ private: ASDCP headers */ - struct MonoASDCPState; - boost::shared_ptr<MonoASDCPState> _state; + struct ASDCPState; + boost::shared_ptr<ASDCPState> _state; }; /** A helper class for writing to StereoPictureAssets progressively (i.e. writing frame-by-frame, @@ -132,8 +132,8 @@ private: ASDCP headers */ - struct StereoASDCPState; - boost::shared_ptr<StereoASDCPState> _state; + struct ASDCPState; + boost::shared_ptr<ASDCPState> _state; libdcp::Eye _next_eye; }; |