Initial butler work.

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

diff --git a/src/lib/film.h b/src/lib/film.h
index 2b700b00752834cc48e803d61404932a8f7e9783..9f473d7110b914866e21e443b2b9918eb90b44d8 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -47,7 +47,6 @@ namespace xmlpp {
 class DCPContentType;
 class Log;
 class Content;
-class Player;
 class Playlist;
 class AudioContent;
 class Screen;
@@ -89,7 +88,7 @@ public:
        }
 
        boost::filesystem::path file (boost::filesystem::path f) const;
-       boost::filesystem::path dir (boost::filesystem::path d) const;
+       boost::filesystem::path dir (boost::filesystem::path d, bool create = true) const;
 
        void use_template (std::string name);
        std::list<std::string> read_metadata (boost::optional<boost::filesystem::path> path = boost::optional<boost::filesystem::path> ());
@@ -132,7 +131,7 @@ public:
                ) const;
 
        std::list<ScreenKDM> make_kdms (
-               std::list<boost::shared_ptr<Screen> >,
+               std::list<boost::shared_ptr<Screen> > screens,
                boost::filesystem::path cpl_file,
                boost::posix_time::ptime from,
                boost::posix_time::ptime until,
@@ -161,9 +160,6 @@ public:
        std::list<DCPTimePeriod> reels () const;
        std::list<int> mapped_audio_channels () const;
 
-       /** @param A period within the DCP
-        *  @return Name of the content which most contributes to the given period.
-        */
        std::string content_summary (DCPTimePeriod period) const;
 
        std::list<std::string> fix_conflicting_settings ();