Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / stereo_picture_asset.h

diff --git a/src/stereo_picture_asset.h b/src/stereo_picture_asset.h
index a6620dcffd8bb0e704bc06d753c98f49de544003..704ea1d4598527b2f03b0dc9e23f6407feebc2e9 100644 (file)
--- a/src/stereo_picture_asset.h
+++ b/src/stereo_picture_asset.h
@@ -1,47 +1,60 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #ifndef LIBDCP_STEREO_PICTURE_ASSET_H
 #define LIBDCP_STEREO_PICTURE_ASSET_H
 
 #include "picture_asset.h"
+#include "stereo_picture_asset_reader.h"
 
 namespace dcp {
-       
-/** A 3D (stereoscopic) picture asset */       
+
+/** A 3D (stereoscopic) picture asset */
 class StereoPictureAsset : public PictureAsset
 {
 public:
-       StereoPictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name);
+       explicit StereoPictureAsset (boost::filesystem::path file);
+       explicit StereoPictureAsset (Fraction edit_rate, Standard standard);
 
-       void read ();
-       
        /** Start a progressive write to a StereoPictureAsset */
-       boost::shared_ptr<PictureAssetWriter> start_write (bool);
-
-       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;
+       boost::shared_ptr<PictureAssetWriter> start_write (boost::filesystem::path file, bool);
+       boost::shared_ptr<StereoPictureAssetReader> start_read () const;
+
+       bool equals (
+               boost::shared_ptr<const Asset> other,
+               EqualityOptions opt,
+               NoteHandler note
+               ) const;
 };
 
 }