Content trim and position in the digests used to decide whether or not a rebuild...

diff --git a/src/lib/content.cc b/src/lib/content.cc
index d2a07f79523f0e052b649a0d64425af9941b62d7..dbb84120034f441ed2028e2eb63a2836aed8ea48 100644 (file)
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -26,6 +26,7 @@
 #include "ui_signaller.h"
 
 using std::string;
+using std::stringstream;
 using std::set;
 using boost::shared_ptr;
 using boost::lexical_cast;
@@ -174,3 +175,19 @@ Content::trimmed (Time t) const
 {
        return (t < trim_start() || t > (full_length() - trim_end ()));
 }
+
+/** @return string which includes everything about how this content affects
+ *  its playlist.
+ */
+string
+Content::identifier () const
+{
+       stringstream s;
+       
+       s << Content::digest()
+         << "_" << position()
+         << "_" << trim_start()
+         << "_" << trim_end();
+
+       return s.str ();
+}

diff --git a/src/lib/content.h b/src/lib/content.h
index 3c57dddbe5847289fab8211439f4cf23a0f593ae..9c7ad2fc2984df5ff021c2f623634ba96310f6a3 100644 (file)
--- a/src/lib/content.h
+++ b/src/lib/content.h
@@ -58,6 +58,7 @@ public:
        virtual std::string information () const = 0;
        virtual void as_xml (xmlpp::Node *) const;
        virtual Time full_length () const = 0;
+       virtual std::string identifier () const;
 
        boost::shared_ptr<Content> clone () const;
        

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 23ef2cf89dcce74463abcbadc0bbd8d824b0905d..3478368555b8139944144170b05ab67198134d4b 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -227,7 +227,7 @@ string
 VideoContent::identifier () const
 {
        stringstream s;
-       s << Content::digest()
+       s << Content::identifier()
          << "_" << crop().left
          << "_" << crop().right
          << "_" << crop().top