projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some more space for macOS preferences icons.
[dcpomatic.git]
/
src
/
wx
/
content_view.cc
diff --git
a/src/wx/content_view.cc
b/src/wx/content_view.cc
index 95b481e0b75d5a74a56b1d5f4a0decadd44c7898..b9fe7ce005a8dde13de020dffa0920317e96d84f 100644
(file)
--- a/
src/wx/content_view.cc
+++ b/
src/wx/content_view.cc
@@
-28,7
+28,9
@@
#include "lib/dcpomatic_assert.h"
#include "lib/examine_content_job.h"
#include "lib/job_manager.h"
#include "lib/dcpomatic_assert.h"
#include "lib/examine_content_job.h"
#include "lib/job_manager.h"
+#include "lib/util.h"
#include <dcp/exceptions.h>
#include <dcp/exceptions.h>
+#include <dcp/filesystem.h>
#include <dcp/warnings.h>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
#include <dcp/warnings.h>
#include <boost/filesystem.hpp>
#include <boost/optional.hpp>
@@
-80,7
+82,7
@@
ContentView::update ()
DeleteAllItems ();
_content.clear ();
auto dir = Config::instance()->player_content_directory();
DeleteAllItems ();
_content.clear ();
auto dir = Config::instance()->player_content_directory();
- if (!dir || !
boost
::filesystem::is_directory(*dir)) {
+ if (!dir || !
dcp
::filesystem::is_directory(*dir)) {
dir = home_directory ();
}
dir = home_directory ();
}
@@
-94,7
+96,7
@@
ContentView::update ()
progress.Pulse ();
shared_ptr<Content> content;
progress.Pulse ();
shared_ptr<Content> content;
- if (is_directory(i) &&
(is_regular_file(i / "ASSETMAP") || is_regular_file(i / "ASSETMAP.xml")
)) {
+ if (is_directory(i) &&
contains_assetmap(i
)) {
content = make_shared<DCPContent>(i);
} else if (i.path().extension() == ".mp4") {
auto all_content = content_factory(i);
content = make_shared<DCPContent>(i);
} else if (i.path().extension() == ".mp4") {
auto all_content = content_factory(i);
@@
-155,7
+157,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);
}