Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/image_content.h b/src/lib/image_content.h
index dcdb7b526660d53b7b23bf411874637be737100e..eeaf1e2b02bea67a346928ba141e1a3dc2c28902 100644 (file)
--- a/src/lib/image_content.h
+++ b/src/lib/image_content.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/>.
 
 */
 
@@ -35,7 +36,7 @@ public:
        void examine (boost::shared_ptr<Job>);
        std::string summary () const;
        std::string technical_summary () const;
-       void as_xml (xmlpp::Node *) const;
+       void as_xml (xmlpp::Node *, bool with_paths) const;
        DCPTime full_length () const;
 
        std::string identifier () const;
@@ -43,6 +44,11 @@ public:
        void set_default_colour_conversion ();
 
        bool still () const;
+
+private:
+       void add_properties (std::list<UserProperty>& p) const;
+
+       boost::optional<boost::filesystem::path> _path_to_scan;
 };
 
 #endif