Add Benno Zwanenburg as a tester.

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

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 0cbb62b54d3744154c079cae22f313d8cba3cb42..9e73900fcf012efd41e30502e27509553aae74ae 100644 (file)
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -30,7 +30,6 @@
 #include "timeline_dialog.h"
 #include "timing_panel.h"
 #include "video_panel.h"
-#include "wx_ptr.h"
 #include "wx_util.h"
 #include "lib/audio_content.h"
 #include "lib/case_insensitive_sorter.h"
@@ -43,14 +42,17 @@
 #include "lib/dcp_subtitle_decoder.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/film.h"
+#include "lib/film_util.h"
 #include "lib/image_content.h"
 #include "lib/log.h"
 #include "lib/playlist.h"
-#include "lib/scope_guard.h"
 #include "lib/string_text_file.h"
 #include "lib/string_text_file_content.h"
 #include "lib/text_content.h"
 #include "lib/video_content.h"
+#include <dcp/filesystem.h>
+#include <dcp/scope_guard.h>
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
 #include <wx/display.h>
@@ -152,9 +154,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 {
@@ -259,7 +261,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..."));
@@ -271,7 +273,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"));
@@ -283,7 +285,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);
@@ -402,11 +404,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:
@@ -528,7 +530,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) {
@@ -541,7 +543,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) {
@@ -581,17 +583,6 @@ ContentPanel::check_selection ()
 }
 
 
-optional<boost::filesystem::path>
-ContentPanel::add_files_override_path() const
-{
-       DCPOMATIC_ASSERT(_film->directory());
-       return Config::instance()->default_add_file_location() == Config::DefaultAddFileLocation::SAME_AS_PROJECT
-               ? _film->directory()->parent_path()
-               : boost::optional<boost::filesystem::path>();
-
-}
-
-
 void
 ContentPanel::add_file_clicked ()
 {
@@ -611,7 +602,8 @@ ContentPanel::add_file_clicked ()
                wxT("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
                wxFD_MULTIPLE | wxFD_CHANGE_DIR,
                "AddFilesPath",
-               add_files_override_path()
+               {},
+               add_files_override_path(_film)
                );
 
        if (dialog.show()) {
@@ -623,7 +615,7 @@ ContentPanel::add_file_clicked ()
 void
 ContentPanel::add_folder_clicked ()
 {
-       DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
+       DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film));
        if (dialog.show()) {
                add_folder(dialog.path());
        }
@@ -666,7 +658,7 @@ ContentPanel::add_folder(boost::filesystem::path folder)
 void
 ContentPanel::add_dcp_clicked ()
 {
-       DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
+       DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film));
        if (dialog.show()) {
                add_dcp(dialog.path());
        }
@@ -715,7 +707,7 @@ ContentPanel::remove_clicked (bool hotkey)
 void
 ContentPanel::timeline_clicked ()
 {
-       if (!_film) {
+       if (!_film || _film->content().empty()) {
                return;
        }
 
@@ -773,8 +765,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 ();
@@ -829,7 +821,7 @@ ContentPanel::set_selection (ContentList cl)
 {
        {
                _no_check_selection = true;
-               ScopeGuard sg = [this]() { _no_check_selection = false; };
+               dcp::ScopeGuard sg = [this]() { _no_check_selection = false; };
 
                auto content = _film->content ();
                for (size_t i = 0; i < content.size(); ++i) {