#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/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"
/* 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 = new FileDialog(
+ FileDialog dialog(
_splitter,
_("Choose a file or files"),
wxT("All files|*.*|Subtitle files|*.srt;*.xml|Audio files|*.wav;*.w64;*.flac;*.aif;*.aiff"),
add_files_override_path()
);
- ScopeGuard sg = [dialog]() { dialog->Destroy(); };
-
- if (dialog->show()) {
- add_files(dialog->paths());
+ if (dialog.show()) {
+ add_files(dialog.paths());
}
}
void
ContentPanel::add_folder_clicked ()
{
- auto d = new DirDialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
- ScopeGuard sg = [d]() { d->Destroy(); };
- 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());
}
}
for (auto i: content) {
auto ic = dynamic_pointer_cast<ImageContent> (i);
if (ic) {
- auto e = new ImageSequenceDialog (_splitter);
- ScopeGuard sg = [e]() { e->Destroy(); };
+ 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);
void
ContentPanel::add_dcp_clicked ()
{
- auto d = new DirDialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path());
- ScopeGuard sg = [d]() { d->Destroy(); };
- 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());
}
}
return;
}
- if (_timeline_dialog) {
- _timeline_dialog->Destroy ();
- _timeline_dialog = nullptr;
- }
-
- _timeline_dialog = new TimelineDialog (this, _film, _film_viewer);
+ _timeline_dialog.reset(this, _film, _film_viewer);
_timeline_dialog->set_selection (selected());
_timeline_dialog->Show ();
}
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 ();
}