Various Doxygen fixes.

[dcpomatic.git] / src / lib / playlist.h

diff --git a/src/lib/playlist.h b/src/lib/playlist.h
index c3890ce8c5d23d441efcf74d45c1d918b4c8fadc..0b19a6e4497000db4292bb0a53bc9e34af896433 100644 (file)
--- a/src/lib/playlist.h
+++ b/src/lib/playlist.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-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/>.
 
 */
 
@@ -44,8 +45,8 @@ public:
        Playlist ();
        ~Playlist ();
 
-       void as_xml (xmlpp::Node *);
-       void set_from_xml (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int, std::list<std::string> &);
+       void as_xml (xmlpp::Node *, bool with_content_paths);
+       void set_from_xml (boost::shared_ptr<const Film> film, cxml::ConstNodePtr node, int version, std::list<std::string>& notes);
 
        void add (boost::shared_ptr<Content>);
        void remove (boost::shared_ptr<Content>);
@@ -54,6 +55,7 @@ public:
        void move_later (boost::shared_ptr<Content>);
 
        ContentList content () const;
+       bool video_content_at (DCPTime time) const;
 
        std::string video_identifier () const;
 
@@ -65,6 +67,7 @@ public:
        DCPTime video_end () const;
        DCPTime subtitle_end () const;
        FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
+       std::string content_summary (DCPTimePeriod period) const;
 
        void set_sequence (bool);
        void maybe_sequence ();