Use dcp::filesystem to wrap filesystem calls and fix_long_path

[dcpomatic.git] / src / wx / content_panel.cc

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index f476c29fc7e02f7f72764cc281053d9b9d133221..56c1d0524bd4a2053eaea192be18221e7935daaf 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -42,6 +42,7 @@
 #include "lib/dcp_subtitle_decoder.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include "lib/image_content.h"
 #include "lib/log.h"
 #include "lib/playlist.h"
@@ -50,6 +51,7 @@
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
+#include <dcp/filesystem.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/display.h>
@@ -151,9 +153,9 @@ public:
                vector<boost::filesystem::path> folders;
                for (size_t i = 0; i < filenames.GetCount(); ++i) {
                        auto path = boost::filesystem::path(wx_to_std(filenames[i]));
-                       if (boost::filesystem::is_regular_file(path)) {
+                       if (dcp::filesystem::is_regular_file(path)) {
                                files.push_back(path);
-                       } else if (boost::filesystem::is_directory(path)) {
+                       } else if (dcp::filesystem::is_directory(path)) {
                                if (contains_assetmap(path)) {
                                        dcps.push_back(path);
                                } else {
@@ -258,7 +260,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& vie
                auto b = new wxBoxSizer (wxVERTICAL);
 
                _add_file = new Button (_top_panel, _("Add file(s)..."));
-               _add_file->SetToolTip (_("Add video, image, sound or subtitle files to the film."));
+               _add_file->SetToolTip(_("Add video, image, sound or subtitle files to the film (Ctrl+A)."));
                b->Add (_add_file, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                _add_folder = new Button (_top_panel, _("Add folder..."));
@@ -270,7 +272,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& vie
                b->Add (_add_dcp, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                _remove = new Button (_top_panel, _("Remove"));
-               _remove->SetToolTip (_("Remove the selected piece of content from the film."));
+               _remove->SetToolTip(_("Remove the selected piece of content from the film (Delete)."));
                b->Add (_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                _earlier = new Button (_top_panel, _("Earlier"));
@@ -282,7 +284,7 @@ ContentPanel::ContentPanel(wxNotebook* n, shared_ptr<Film> film, FilmViewer& vie
                b->Add (_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                _timeline = new Button (_top_panel, _("Timeline..."));
-               _timeline->SetToolTip (_("Open the timeline for the film."));
+               _timeline->SetToolTip(_("Open the timeline for the film (Ctrl+T)."));
                b->Add (_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
                s->Add (b, 0, wxALL, 4);
@@ -401,11 +403,11 @@ ContentPanel::selected_ffmpeg ()
 
 
 void
-ContentPanel::film_changed (Film::Property p)
+ContentPanel::film_changed(FilmProperty p)
 {
        switch (p) {
-       case Film::Property::CONTENT:
-       case Film::Property::CONTENT_ORDER:
+       case FilmProperty::CONTENT:
+       case FilmProperty::CONTENT_ORDER:
                setup ();
                break;
        default:
@@ -527,7 +529,7 @@ ContentPanel::check_selection ()
                _video_panel->create ();
        } else if (!have_video && _video_panel) {
                _notebook->DeletePage (off);
-               _video_panel = 0;
+               _video_panel = nullptr;
        }
 
        if (have_video) {
@@ -540,7 +542,7 @@ ContentPanel::check_selection ()
                _audio_panel->create ();
        } else if (!have_audio && _audio_panel) {
                _notebook->DeletePage (off);
-               _audio_panel = 0;
+               _audio_panel = nullptr;
        }
 
        if (have_audio) {
@@ -714,7 +716,7 @@ ContentPanel::remove_clicked (bool hotkey)
 void
 ContentPanel::timeline_clicked ()
 {
-       if (!_film) {
+       if (!_film || _film->content().empty()) {
                return;
        }
 
@@ -772,8 +774,8 @@ ContentPanel::set_film (shared_ptr<Film> film)
 
        _film = film;
 
-       film_changed (Film::Property::CONTENT);
-       film_changed (Film::Property::AUDIO_CHANNELS);
+       film_changed(FilmProperty::CONTENT);
+       film_changed(FilmProperty::AUDIO_CHANNELS);
 
        if (_film) {
                check_selection ();