Some OS X build fixes.

[libdcp.git] / src / stereo_picture_mxf.h

diff --git a/src/stereo_picture_mxf.h b/src/stereo_picture_mxf.h
index 2e16b22c0e85b1e763d7454585551a24ec226d69..9a094d19b52d29699910edaf59985705242f56ef 100644 (file)
--- a/src/stereo_picture_mxf.h
+++ b/src/stereo_picture_mxf.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -28,20 +28,19 @@ namespace dcp {
 class StereoPictureMXF : public PictureMXF
 {
 public:
-       StereoPictureMXF (boost::filesystem::path directory, boost::filesystem::path mxf_name);
+       StereoPictureMXF (boost::filesystem::path file);
+       StereoPictureMXF (Fraction edit_rate);
 
-       void read ();
-       
        /** Start a progressive write to a StereoPictureMXF */
-       boost::shared_ptr<PictureMXFWriter> start_write (bool);
+       boost::shared_ptr<PictureMXFWriter> start_write (boost::filesystem::path file, Standard, bool);
 
+       bool equals (
+               boost::shared_ptr<const Asset> other,
+               EqualityOptions opt,
+               NoteHandler note
+               ) const;
+       
        boost::shared_ptr<const StereoPictureFrame> get_frame (int n) const;
-       bool equals (boost::shared_ptr<const ContentAsset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
-
-private:
-       std::string cpl_node_name () const;
-       std::pair<std::string, std::string> cpl_node_attribute () const;
-       int edit_rate_factor () const;
 };
 
 }