X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fcontent_panel.cc;h=f476c29fc7e02f7f72764cc281053d9b9d133221;hb=e87f943433216d294b22853411eca5c582be1066;hp=456dbcb56db8f1980f890dbfba07408ff482996c;hpb=fe851f2e6e57d3a8781ecc173089c19632c521e3;p=dcpomatic.git

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 456dbcb56..f476c29fc 100644
--- 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"
@@ -46,6 +45,7 @@
 #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"
@@ -195,6 +195,7 @@ public:
 	struct Item
 	{
 		wxString text;
+		weak_ptr<Content> content;
 		bool error;
 	};
 
@@ -217,6 +218,14 @@ public:
 		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;
@@ -320,9 +329,9 @@ ContentPanel::selected ()
 			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);
 		}
 	}
 
@@ -595,7 +604,7 @@ ContentPanel::add_file_clicked ()
 	/* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
 	   non-Latin filenames or paths.
 	*/
-	auto dialog = make_wx<FileDialog>(
+	FileDialog dialog(
 		_splitter,
 		_("Choose a file or files"),
 		wxT("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
@@ -604,8 +613,8 @@ ContentPanel::add_file_clicked ()
 		add_files_override_path()
 		);
 
-	if (dialog->show()) {
-		add_files(dialog->paths());
+	if (dialog.show()) {
+		add_files(dialog.paths());
 	}
 }
 
@@ -613,9 +622,9 @@ ContentPanel::add_file_clicked ()
 void
 ContentPanel::add_folder_clicked ()
 {
-	auto d = make_wx<DirDialog>(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
-	if (d->show()) {
-		add_folder(d->path());
+	DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
+	if (dialog.show()) {
+		add_folder(dialog.path());
 	}
 }
 
@@ -640,12 +649,12 @@ ContentPanel::add_folder(boost::filesystem::path folder)
 	for (auto i: content) {
 		auto ic = dynamic_pointer_cast<ImageContent> (i);
 		if (ic) {
-			auto e = make_wx<ImageSequenceDialog>(_splitter);
+			ImageSequenceDialog dialog(_splitter);
 
-			if (e->ShowModal() != wxID_OK) {
+			if (dialog.ShowModal() != wxID_OK) {
 				return;
 			}
-			ic->set_video_frame_rate(_film, e->frame_rate());
+			ic->set_video_frame_rate(_film, dialog.frame_rate());
 		}
 
 		_film->examine_and_add_content (i);
@@ -656,9 +665,9 @@ ContentPanel::add_folder(boost::filesystem::path folder)
 void
 ContentPanel::add_dcp_clicked ()
 {
-	auto d = make_wx<DirDialog>(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
-	if (d->show()) {
-		add_dcp(d->path());
+	DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
+	if (dialog.show()) {
+		add_dcp(dialog.path());
 	}
 }
 
@@ -817,14 +826,16 @@ ContentPanel::set_selection (weak_ptr<Content> wc)
 void
 ContentPanel::set_selection (ContentList cl)
 {
-	_no_check_selection = true;
+	{
+		_no_check_selection = true;
+		ScopeGuard sg = [this]() { _no_check_selection = false; };
 
-	auto content = _film->content ();
-	for (size_t i = 0; i < content.size(); ++i) {
-		set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end());
+		auto content = _film->content ();
+		for (size_t i = 0; i < content.size(); ++i) {
+			set_selected_state(i, find(cl.begin(), cl.end(), content[i]) != cl.end());
+		}
 	}
 
-	_no_check_selection = false;
 	check_selection ();
 }
 
@@ -865,21 +876,11 @@ ContentPanel::setup ()
 	}
 
 	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);
@@ -900,18 +901,15 @@ ContentPanel::setup ()
 			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 ();