Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/content.h b/src/lib/content.h
index 2deee9763b70f3bc9c37edd901fcb93858de02c3..14fa3c36a933b3f0389bb84917a1b90363567aa1 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -27,13 +27,16 @@
 #include "types.h"
 #include "signaller.h"
 #include "dcpomatic_time.h"
-#include <libxml++/libxml++.h>
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
 #include <boost/signals2.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
+namespace xmlpp {
+       class Node;
+}
+
 namespace cxml {
        class Node;
 }
@@ -128,16 +131,16 @@ public:
                return _position;
        }
 
-       void set_trim_start (DCPTime);
+       void set_trim_start (ContentTime);
 
-       DCPTime trim_start () const {
+       ContentTime trim_start () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _trim_start;
        }
 
-       void set_trim_end (DCPTime);
+       void set_trim_end (ContentTime);
 
-       DCPTime trim_end () const {
+       ContentTime trim_end () const {
                boost::mutex::scoped_lock lm (_mutex);
                return _trim_end;
        }
@@ -176,8 +179,8 @@ protected:
 private:
        std::string _digest;
        DCPTime _position;
-       DCPTime _trim_start;
-       DCPTime _trim_end;
+       ContentTime _trim_start;
+       ContentTime _trim_end;
        bool _change_signals_frequent;
 };