debug.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 2780dbf5c6a838f4de159ee29988079478825b9d..792ec583aa241070c0e5438e4f3681bacfdd4b4b 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -775,7 +775,7 @@ Film::subtitle_languages () const
 {
        pair<optional<dcp::LanguageTag>, vector<dcp::LanguageTag>> result;
        for (auto i: content()) {
-               for (auto text: i->text) {
+               for (auto const& text: i->text) {
                        if (text->use() && text->type() == TextType::OPEN_SUBTITLE && text->language()) {
                                if (text->language_is_additional()) {
                                        result.second.push_back(text->language().get());
@@ -1303,7 +1303,7 @@ Film::cpls () const
        for (auto const& item: dcp::filesystem::directory_iterator(dir)) {
                if (
                        dcp::filesystem::is_directory(item) &&
-                       item.path().leaf() != "j2c" && item.path().leaf() != "video" && item.path().leaf() != "info" && item.path().leaf() != "analysis"
+                       item.path().filename() != "j2c" && item.path().filename() != "video" && item.path().filename() != "info" && item.path().filename() != "analysis"
                        ) {
 
                        try {
@@ -1340,15 +1340,21 @@ Film::content () const
 void
 Film::examine_and_add_content (shared_ptr<Content> content, bool disable_audio_analysis)
 {
+       std::cout << "hello mum.\n";
        if (dynamic_pointer_cast<FFmpegContent> (content) && _directory) {
-               run_ffprobe (content->path(0), file("ffprobe.log"));
+               // run_ffprobe (content->path(0), file("ffprobe.log"));
        }
+       std::cout << "fuck\n";
+       auto x = shared_from_this();
+       std::cout << "sft worked.\n";
 
        auto j = make_shared<ExamineContentJob>(shared_from_this(), content);
+       std::cout << "shit\n";
 
        _job_connections.push_back (
                j->Finished.connect (bind (&Film::maybe_add_content, this, weak_ptr<Job>(j), weak_ptr<Content>(content), disable_audio_analysis))
                );
+       std::cout << "muthefucka";
 
        JobManager::instance()->add (j);
 }