projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp for better ContentKind support, and libsub
[dcpomatic.git]
/
src
/
wx
/
content_view.cc
diff --git
a/src/wx/content_view.cc
b/src/wx/content_view.cc
index 80256987971e654e6e1bdeb49c193e5cc94de80d..468b3bf97c0e4b324984d9c295c1939858f75a2d 100644
(file)
--- a/
src/wx/content_view.cc
+++ b/
src/wx/content_view.cc
@@
-99,7
+99,7
@@
ContentView::update ()
} 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()) {
- content = all_content
.front()
;
+ content = all_content
[0]
;
}
}
}
}
@@
-155,7
+155,7
@@
ContentView::add (shared_ptr<Content> content)
if (dcp && dcp->content_kind()) {
it.SetId(N);
it.SetColumn(1);
if (dcp && dcp->content_kind()) {
it.SetId(N);
it.SetColumn(1);
- it.SetText(std_to_wx(dcp
::content_kind_to_string(*dcp->content_kind()
)));
+ it.SetText(std_to_wx(dcp
->content_kind()->name(
)));
SetItem(it);
}
SetItem(it);
}