Setup Butler::_prepare_only_proxy on construction.

[dcpomatic.git] / src / lib / video_mxf_examiner.cc

diff --git a/src/lib/video_mxf_examiner.cc b/src/lib/video_mxf_examiner.cc
index 506e6985c10c03156a40aafd20340bcb69c151a4..8c7029ea817f3ff255efcd7c6ae621db4d991d14 100644 (file)
--- a/src/lib/video_mxf_examiner.cc
+++ b/src/lib/video_mxf_examiner.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -23,7 +24,7 @@
 #include <dcp/mono_picture_asset.h>
 #include <dcp/stereo_picture_asset.h>
 
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 
 VideoMXFExaminer::VideoMXFExaminer (shared_ptr<const VideoMXFContent> content)
@@ -32,7 +33,7 @@ VideoMXFExaminer::VideoMXFExaminer (shared_ptr<const VideoMXFContent> content)
                _asset.reset (new dcp::MonoPictureAsset (content->path(0)));
        } catch (dcp::MXFFileError& e) {
                /* maybe it's stereo */
-       } catch (dcp::DCPReadError& e) {
+       } catch (dcp::ReadError& e) {
                /* maybe it's stereo */
        }