Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / reel.h

diff --git a/src/reel.h b/src/reel.h
index 278a0f916a23000c78e423c6a5a13b9909148af4..fa37c84041bb8b22731d6e18fcffabdad3e0021a 100644 (file)
--- a/src/reel.h
+++ b/src/reel.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 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_REEL_H
@@ -23,7 +37,6 @@
 #include "key.h"
 #include "types.h"
 #include "ref.h"
-#include <libxml++/libxml++.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
 #include <list>
@@ -32,6 +45,10 @@ namespace cxml {
        class Node;
 }
 
+namespace xmlpp {
+       class Element;
+}
+
 namespace dcp {
 
 class DecryptedKDM;
@@ -39,26 +56,30 @@ class ReelAsset;
 class ReelPictureAsset;
 class ReelSoundAsset;
 class ReelSubtitleAsset;
+class ReelClosedCaptionAsset;
+class ReelAtmosAsset;
 class Content;
 
-/** @brief A reel within a DCP; the part which actually refers to picture, sound and subtitle data */  
+/** @brief A reel within a DCP; the part which actually refers to picture, sound and subtitle data */
 class Reel : public Object
 {
 public:
        Reel () {}
-       
+
        Reel (
                boost::shared_ptr<ReelPictureAsset> picture,
-               boost::shared_ptr<ReelSoundAsset> sound,
-               boost::shared_ptr<ReelSubtitleAsset> subtitle
+               boost::shared_ptr<ReelSoundAsset> sound = boost::shared_ptr<ReelSoundAsset> (),
+               boost::shared_ptr<ReelSubtitleAsset> subtitle = boost::shared_ptr<ReelSubtitleAsset> (),
+               boost::shared_ptr<ReelAtmosAsset> atmos = boost::shared_ptr<ReelAtmosAsset> ()
                )
                : _main_picture (picture)
                , _main_sound (sound)
                , _main_subtitle (subtitle)
+               , _atmos (atmos)
        {}
 
-       Reel (boost::shared_ptr<const cxml::Node>);
-       
+       explicit Reel (boost::shared_ptr<const cxml::Node>);
+
        boost::shared_ptr<ReelPictureAsset> main_picture () const {
                return _main_picture;
        }
@@ -66,11 +87,21 @@ public:
        boost::shared_ptr<ReelSoundAsset> main_sound () const {
                return _main_sound;
        }
-       
+
        boost::shared_ptr<ReelSubtitleAsset> main_subtitle () const {
                return _main_subtitle;
        }
 
+       std::list<boost::shared_ptr<ReelClosedCaptionAsset> > closed_captions () const {
+               return _closed_captions;
+       }
+
+       boost::shared_ptr<ReelAtmosAsset> atmos () const {
+               return _atmos;
+       }
+
+       int64_t duration () const;
+
        void add (boost::shared_ptr<ReelAsset> asset);
 
        void write_to_cpl (xmlpp::Element* node, Standard standard) const;
@@ -81,12 +112,14 @@ public:
 
        void add (DecryptedKDM const &);
 
-       void resolve_refs (std::list<boost::shared_ptr<Object> >);
+       void resolve_refs (std::list<boost::shared_ptr<Asset> >);
 
 private:
        boost::shared_ptr<ReelPictureAsset> _main_picture;
        boost::shared_ptr<ReelSoundAsset> _main_sound;
        boost::shared_ptr<ReelSubtitleAsset> _main_subtitle;
+       std::list<boost::shared_ptr<ReelClosedCaptionAsset> > _closed_captions;
+       boost::shared_ptr<ReelAtmosAsset> _atmos;
 };
 
 }