Renaming to try to fix windows confusion.

diff --git a/src/picture_asset_writer.cc b/src/picture_asset_writer.cc
index 8ac76c9c522096a4aef61f63a1410ca059f8f4eb..b5ced7606925852c71973f89840dd18a31ea2867 100644 (file)
--- 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)
 {
 

diff --git a/src/picture_asset_writer.h b/src/picture_asset_writer.h
index a0f0bdc8250f3f6f554009c4ad82ea1c55af0fca..6f33d3b693cf40c563595a2489d504b176b09b45 100644 (file)
--- a/src/picture_asset_writer.h
+++ b/src/picture_asset_writer.h
@@ -101,8 +101,8 @@ private:
           ASDCP headers
        */
           
-       struct ASDCPState;
-       boost::shared_ptr<ASDCPState> _state;
+       struct MonoASDCPState;
+       boost::shared_ptr<MonoASDCPState> _state;
 };
 
 /** A helper class for writing to StereoPictureAssets progressively (i.e. writing frame-by-frame,
@@ -132,8 +132,8 @@ private:
           ASDCP headers
        */
           
-       struct ASDCPState;
-       boost::shared_ptr<ASDCPState> _state;
+       struct StereoASDCPState;
+       boost::shared_ptr<StereoASDCPState> _state;
 
        libdcp::Eye _next_eye;
 };