X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_view.cc;h=67a9a3fa53c90b4faa1395ef5200c1701bdba14f;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=1cdfbc00f8f4fb49d95a9594330404195d34695d;hpb=f0a2a52ddd1118236d4ce5640339c24bae88aa12;p=dcpomatic.git

diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc
index 1cdfbc00f..67a9a3fa5 100644
--- a/src/wx/content_view.cc
+++ b/src/wx/content_view.cc
@@ -35,10 +35,10 @@
 using std::string;
 using std::cout;
 using std::list;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
 using namespace dcpomatic;
 
 ContentView::ContentView (wxWindow* parent)
@@ -82,6 +82,8 @@ ContentView::update ()
 
 	for (directory_iterator i = directory_iterator(*dir); i != directory_iterator(); ++i) {
 		try {
+			progress.Pulse ();
+
 			shared_ptr<Content> content;
 			if (is_directory(*i) && (is_regular_file(*i / "ASSETMAP") || is_regular_file(*i / "ASSETMAP.xml"))) {
 				content.reset (new DCPContent(*i));
@@ -96,7 +98,7 @@ ContentView::update ()
 			}
 		} catch (boost::filesystem::filesystem_error& e) {
 			/* Never mind */
-		} catch (dcp::DCPReadError& e) {
+		} catch (dcp::ReadError& e) {
 			/* Never mind */
 		}
 	}