X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fcontent_menu.cc;h=3d5b002798ee72d6c8cce2d968f0733879a8b0c6;hp=99b942174e0b508137f8e259d88eaca35131d61a;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=e669b562937786bf5b771c927cc03a4074b01be8 diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 99b942174..3d5b00279 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -37,14 +37,12 @@ #include #include #include -#include #include 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,7 +159,7 @@ ContentMenu::join () } try { - shared_ptr joined = boost::make_shared (film, fc); + shared_ptr joined (new FFmpegContent (film, fc)); BOOST_FOREACH (shared_ptr i, _content) { film->remove_content (i); } @@ -266,7 +264,7 @@ ContentMenu::find_missing () return; } - shared_ptr j = make_shared (film, content); + shared_ptr j (new ExamineContentJob (film, content)); _job_connection = j->Finished.connect ( bind (