Fix slightly odd #includes of image_filename_sorter.cc

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

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 37aa7cbc1953017107b8403f95a611713fc6bb99..c415f933dd637c696a57ce07ef23863e233d65c0 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -25,13 +25,14 @@
 #include "frame_rate_change.h"
 #include "exceptions.h"
 #include "safe_stringstream.h"
+#include "image_filename_sorter.h"
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
-#include "image_filename_sorter.cc"
-
 using std::string;
 using std::cout;
 using boost::shared_ptr;
@@ -40,19 +41,12 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
        : Content (film)
        , VideoContent (film)
 {
-       bool have_j2k = false;
        if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
                _paths.push_back (p);
-               if (valid_j2k_file (p)) {
-                       have_j2k = true;
-               }
        } else {
                for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
                        if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) {
                                _paths.push_back (i->path ());
-                               if (valid_j2k_file (i->path ())) {
-                                       have_j2k = true;
-                               }
                        }
                }
 
@@ -62,11 +56,6 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
 
                sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
        }
-
-       if (have_j2k) {
-               /* We default to no colour conversion if we have JPEG2000 files */
-               unset_colour_conversion (false);
-       }
 }
 
 
@@ -162,23 +151,16 @@ ImageContent::still () const
 }
 
 void
-ImageContent::set_video_frame_rate (float r)
+ImageContent::set_default_colour_conversion ()
 {
-       {
-               boost::mutex::scoped_lock lm (_mutex);
-               if (_video_frame_rate == r) {
+       BOOST_FOREACH (boost::filesystem::path i, _paths) {
+               if (valid_j2k_file (i)) {
+                       /* We default to no colour conversion if we have JPEG2000 files */
+                       unset_colour_conversion ();
                        return;
                }
-
-               _video_frame_rate = r;
        }
 
-       signal_changed (VideoContentProperty::VIDEO_FRAME_RATE);
-}
-
-void
-ImageContent::set_default_colour_conversion ()
-{
        bool const s = still ();
 
        boost::mutex::scoped_lock lm (_mutex);