projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Little C++11 cleanup.
[dcpomatic.git]
/
src
/
wx
/
content_view.cc
diff --git
a/src/wx/content_view.cc
b/src/wx/content_view.cc
index 57a5535c9bd8eb1b3d3208d77fb66ec4b19204f7..80256987971e654e6e1bdeb49c193e5cc94de80d 100644
(file)
--- a/
src/wx/content_view.cc
+++ b/
src/wx/content_view.cc
@@
-95,7
+95,7
@@
ContentView::update ()
shared_ptr<Content> content;
if (is_directory(i) && (is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml"))) {
shared_ptr<Content> content;
if (is_directory(i) && (is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml"))) {
- content
.reset (new DCPContent(i)
);
+ content
= make_shared<DCPContent>(i
);
} else if (i.path().extension() == ".mp4") {
auto all_content = content_factory(i);
if (!all_content.empty()) {
} else if (i.path().extension() == ".mp4") {
auto all_content = content_factory(i);
if (!all_content.empty()) {