New libdcp API.

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index b9c1ce2e1c7762b10ddccf20904c530237b31e3c..939a2906dada778f82c8f10a7c14b1896e342d8e 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -74,7 +74,7 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
        */
 
        if (f->dcp_3d ()) {
-               _stereo_picture_asset.reset (
+               _picture_asset.reset (
                        new libdcp::StereoPictureAsset (
                                _film->internal_video_mxf_dir (),
                                _film->internal_video_mxf_filename (),
@@ -83,13 +83,8 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
                                )
                        );
                
-               _stereo_picture_asset_writer = _stereo_picture_asset->start_write (_first_nonexistant_frame > 0);
-
-               _picture_asset = _stereo_picture_asset;
-               _picture_asset_writer = _stereo_picture_asset_writer;
-               
        } else {
-               _mono_picture_asset.reset (
+               _picture_asset.reset (
                        new libdcp::MonoPictureAsset (
                                _film->internal_video_mxf_dir (),
                                _film->internal_video_mxf_filename (),
@@ -98,12 +93,10 @@ Writer::Writer (shared_ptr<const Film> f, shared_ptr<Job> j)
                                )
                        );
 
-               _mono_picture_asset_writer = _mono_picture_asset->start_write (_first_nonexistant_frame > 0);
-
-               _picture_asset = _mono_picture_asset;
-               _picture_asset_writer = _mono_picture_asset_writer;
        }
 
+       _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
+       
        _sound_asset.reset (
                new libdcp::SoundAsset (
                        _film->dir (_film->dcp_name()),
@@ -243,17 +236,8 @@ try
                                        qi.encoded.reset (new EncodedData (_film->j2c_path (qi.frame, qi.eyes, false)));
                                }
 
-                               if (_mono_picture_asset_writer) {
-                                       libdcp::FrameInfo fin = _mono_picture_asset_writer->write (qi.encoded->data(), qi.encoded->size());
-                                       qi.encoded->write_info (_film, qi.frame, qi.eyes, fin);
-                               } else {
-                                       libdcp::FrameInfo fin = _stereo_picture_asset_writer->write (
-                                               qi.encoded->data(),
-                                               qi.encoded->size(),
-                                               qi.eyes == EYES_LEFT ? libdcp::EYE_LEFT : libdcp::EYE_RIGHT
-                                               );
-                                       qi.encoded->write_info (_film, qi.frame, qi.eyes, fin);
-                               }
+                               libdcp::FrameInfo fin = _picture_asset_writer->write (qi.encoded->data(), qi.encoded->size());
+                               qi.encoded->write_info (_film, qi.frame, qi.eyes, fin);
                                _last_written[qi.eyes] = qi.encoded;
                                ++_full_written;
                                break;
@@ -267,26 +251,12 @@ try
                        case QueueItem::REPEAT:
                        {
                                _film->log()->log (String::compose (N_("Writer REPEAT-writes %1 to MXF"), qi.frame));
-                               if (_mono_picture_asset_writer) {
-
-                                       libdcp::FrameInfo fin = _mono_picture_asset_writer->write (
-                                               _last_written[qi.eyes]->data(),
-                                               _last_written[qi.eyes]->size()
-                                               );
-                                       
-                                       _last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin);
-                                       
-                               } else {
-                                       
-                                       libdcp::FrameInfo fin = _stereo_picture_asset_writer->write (
-                                               _last_written[qi.eyes]->data(),
-                                               _last_written[qi.eyes]->size(),
-                                               qi.eyes == EYES_LEFT ? libdcp::EYE_LEFT : libdcp::EYE_RIGHT
-                                               );
-                                       
-                                       _last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin);
-                               }
-                                       
+                               libdcp::FrameInfo fin = _picture_asset_writer->write (
+                                       _last_written[qi.eyes]->data(),
+                                       _last_written[qi.eyes]->size()
+                                       );
+                               
+                               _last_written[qi.eyes]->write_info (_film, qi.frame, qi.eyes, fin);
                                ++_repeat_written;
                                break;
                        }

diff --git a/src/lib/writer.h b/src/lib/writer.h
index db2c042faa3671e8407072afdd77cb891a9e282d..d922cfce01a4685ed1b5941dc1bf0998f999c3ba 100644 (file)
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -128,10 +128,6 @@ private:
        
        boost::shared_ptr<libdcp::PictureAsset> _picture_asset;
        boost::shared_ptr<libdcp::PictureAssetWriter> _picture_asset_writer;
-       boost::shared_ptr<libdcp::MonoPictureAsset> _mono_picture_asset;
-       boost::shared_ptr<libdcp::MonoPictureAssetWriter> _mono_picture_asset_writer;
-       boost::shared_ptr<libdcp::StereoPictureAsset> _stereo_picture_asset;
-       boost::shared_ptr<libdcp::StereoPictureAssetWriter> _stereo_picture_asset_writer;
        boost::shared_ptr<libdcp::SoundAsset> _sound_asset;
        boost::shared_ptr<libdcp::SoundAssetWriter> _sound_asset_writer;
 };