#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"
#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"
+#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/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/display.h>
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 {
struct Item
{
wxString text;
+ weak_ptr<Content> content;
bool error;
};
return _items[item].error ? const_cast<wxListItemAttr*>(&_red) : nullptr;
}
+ weak_ptr<Content> content_at_index(long index)
+ {
+ if (index < 0 || index >= static_cast<long>(_items.size())) {
+ return {};
+ }
+ return _items[index].content;
+ }
+
private:
std::vector<Item> _items;
wxListItemAttr _red;
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..."));
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"));
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);
break;
}
- auto cl = _film->content();
- if (s < int (cl.size())) {
- sel.push_back (cl[s]);
+ auto weak = _content->content_at_index(s);
+ if (auto content = weak.lock()) {
+ sel.push_back(content);
}
}
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:
_video_panel->create ();
} else if (!have_video && _video_panel) {
_notebook->DeletePage (off);
- _video_panel = 0;
+ _video_panel = nullptr;
}
if (have_video) {
_audio_panel->create ();
} else if (!have_audio && _audio_panel) {
_notebook->DeletePage (off);
- _audio_panel = 0;
+ _audio_panel = nullptr;
}
if (have_audio) {
void
ContentPanel::timeline_clicked ()
{
- if (!_film) {
+ if (!_film || _film->content().empty()) {
return;
}
_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 ();
}
auto content = _film->content ();
-
- Content* selected_content = nullptr;
- auto const s = _content->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
- if (s != -1) {
- wxListItem item;
- item.SetId (s);
- item.SetMask (wxLIST_MASK_DATA);
- _content->GetItem (item);
- selected_content = reinterpret_cast<Content*> (item.GetData ());
- }
+ auto selection = selected();
vector<ContentListCtrl::Item> items;
for (auto i: content) {
- int const t = _content->GetItemCount ();
bool const valid = i->paths_valid ();
auto dcp = dynamic_pointer_cast<DCPContent> (i);
s = _("NEEDS OV: ") + s;
}
- items.push_back({s, !valid || needs_kdm || needs_assets});
-
- if (i.get() == selected_content) {
- set_selected_state(t, true);
- }
+ items.push_back({s, i, !valid || needs_kdm || needs_assets});
}
_content->set(items);
- if (!selected_content && !content.empty ()) {
- /* Select the item of content if none was selected before */
+ if (selection.empty() && !content.empty()) {
set_selected_state(0, true);
+ } else {
+ set_selection(selection);
}
setup_sensitivity ();