Updated ru_RU translation from Igor Voytovich.

[dcpomatic.git] / src / wx / content_menu.cc

diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 99b942174e0b508137f8e259d88eaca35131d61a..70fc766ac9c14135590b9b9b15225eda8031dfe1 100644 (file)
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -37,14 +37,12 @@
 #include <wx/wx.h>
 #include <wx/dirdlg.h>
 #include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::cout;
 using std::vector;
 using std::exception;
 using boost::shared_ptr;
-using boost::make_shared;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 
@@ -161,11 +159,9 @@ ContentMenu::join ()
        }
 
        try {
-               shared_ptr<FFmpegContent> joined = boost::make_shared<FFmpegContent> (film, fc);
-               BOOST_FOREACH (shared_ptr<Content> i, _content) {
-                       film->remove_content (i);
-               }
-               film->add_content (joined);
+               shared_ptr<FFmpegContent> joined (new FFmpegContent (film, fc));
+               film->remove_content (_content);
+               film->examine_and_add_content (joined);
        } catch (JoinError& e) {
                error_dialog (_parent, std_to_wx (e.what ()));
        }
@@ -266,7 +262,7 @@ ContentMenu::find_missing ()
                return;
        }
 
-       shared_ptr<Job> j = make_shared<ExamineContentJob> (film, content);
+       shared_ptr<Job> j (new ExamineContentJob (film, content));
 
        _job_connection = j->Finished.connect (
                bind (