MXF -> Asset in lots of places.

[libdcp.git] / src / stereo_picture_asset.h

diff --git a/src/stereo_picture_asset.h b/src/stereo_picture_asset.h
index 64cdb6b331fd16e31d1bbda7b6d7f3cea7f1cc21..2fe893de90ade58549f7ed72f924e3061621e7db 100644 (file)
--- a/src/stereo_picture_asset.h
+++ b/src/stereo_picture_asset.h
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -22,26 +22,25 @@
 
 #include "picture_asset.h"
 
-namespace libdcp {
+namespace dcp {
        
 /** A 3D (stereoscopic) picture asset */       
 class StereoPictureAsset : public PictureAsset
 {
 public:
-       StereoPictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name);
+       StereoPictureAsset (boost::filesystem::path file);
+       StereoPictureAsset (Fraction edit_rate);
 
-       void read ();
-       
        /** Start a progressive write to a StereoPictureAsset */
-       boost::shared_ptr<PictureAssetWriter> start_write (bool);
+       boost::shared_ptr<PictureAssetWriter> 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 Asset> 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;
 };
 
 }