summaryrefslogtreecommitdiff
path: root/src/picture_asset_writer.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-23 20:12:00 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-23 20:12:00 +0100
commitdddaa7abf05f182246a5b7d9b6ebc64c25d4bd86 (patch)
tree8202b91dea37519b16795a82a51e89dab81c95f8 /src/picture_asset_writer.cc
parentcda45ffec08fef1a6d4ac99b0d0b1807e6fe0185 (diff)
Renaming to try to fix windows confusion.
Diffstat (limited to 'src/picture_asset_writer.cc')
-rw-r--r--src/picture_asset_writer.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index 8ac76c9c..b5ced760 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 ASDCPStateBase
+struct ASDCPState
{
- ASDCPStateBase ()
+ ASDCPState ()
: frame_buffer (4 * Kumu::Megabyte)
{}
@@ -64,12 +64,12 @@ struct ASDCPStateBase
ASDCP::JP2K::PictureDescriptor picture_descriptor;
};
-struct MonoPictureAssetWriter::ASDCPState : public ASDCPStateBase
+struct MonoPictureAssetWriter::MonoASDCPState : public ASDCPState
{
ASDCP::JP2K::MXFWriter mxf_writer;
};
-struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase
+struct StereoPictureAssetWriter::StereoASDCPState : public ASDCPState
{
ASDCP::JP2K::MXFSWriter mxf_writer;
};
@@ -79,14 +79,14 @@ struct StereoPictureAssetWriter::ASDCPState : public ASDCPStateBase
*/
MonoPictureAssetWriter::MonoPictureAssetWriter (PictureAsset* asset, bool overwrite, MXFMetadata const & metadata)
: PictureAssetWriter (asset, overwrite, metadata)
- , _state (new MonoPictureAssetWriter::ASDCPState)
+ , _state (new MonoPictureAssetWriter::MonoASDCPState)
{
}
StereoPictureAssetWriter::StereoPictureAssetWriter (PictureAsset* asset, bool overwrite, MXFMetadata const & metadata)
: PictureAssetWriter (asset, overwrite, metadata)
- , _state (new StereoPictureAssetWriter::ASDCPState)
+ , _state (new StereoPictureAssetWriter::StereoASDCPState)
, _next_eye (EYE_LEFT)
{