#include "repeat_dialog.h"
#include "timeline_video_content_view.h"
#include "timeline_audio_content_view.h"
+#include "wx_ptr.h"
#include "wx_util.h"
#include "lib/audio_content.h"
#include "lib/config.h"
#include "lib/content_factory.h"
+#include "lib/constants.h"
#include "lib/copy_dcp_details_to_film.h"
#include "lib/dcp_content.h"
#include "lib/dcp_examiner.h"
};
-ContentMenu::ContentMenu (wxWindow* p, weak_ptr<FilmViewer> viewer)
+ContentMenu::ContentMenu(wxWindow* p, FilmViewer& viewer)
: _menu (new wxMenu)
, _parent (p)
, _pop_up_open (false)
return;
}
- auto d = new RepeatDialog (_parent);
+ auto d = make_wx<RepeatDialog>(_parent);
if (d->ShowModal() != wxID_OK) {
- d->Destroy ();
return;
}
}
film->repeat_content (_content, d->number ());
- d->Destroy ();
_content.clear ();
_views.clear ();
boost::filesystem::path path;
if ((ic && !ic->still ()) || dc) {
- auto d = new wxDirDialog (nullptr, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
+ auto d = make_wx<wxDirDialog>(nullptr, _("Choose a folder"), wxT (""), wxDD_DIR_MUST_EXIST);
r = d->ShowModal ();
path = wx_to_std (d->GetPath());
- d->Destroy ();
} else {
- auto d = new wxFileDialog (nullptr, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*"));
+ auto d = make_wx<wxFileDialog>(nullptr, _("Choose a file"), wxT (""), wxT (""), wxT ("*.*"));
r = d->ShowModal ();
path = wx_to_std (d->GetPath());
- d->Destroy ();
}
if (r == wxID_CANCEL) {
auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
DCPOMATIC_ASSERT (dcp);
- auto d = new wxFileDialog (_parent, _("Select KDM"));
+ auto d = make_wx<wxFileDialog>(_parent, _("Select KDM"));
- if (d->ShowModal() == wxID_OK) {
- optional<dcp::EncryptedKDM> kdm;
- try {
- kdm = dcp::EncryptedKDM (dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE));
- } catch (exception& e) {
- error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what()));
- d->Destroy ();
- return;
- }
-
- /* Try to decrypt it to get an early preview of any errors */
- try {
- decrypt_kdm_with_helpful_error (*kdm);
- } catch (KDMError& e) {
- error_dialog (_parent, std_to_wx(e.summary()), std_to_wx(e.detail()));
- return;
- } catch (exception& e) {
- error_dialog (_parent, e.what());
- return;
- }
+ if (d->ShowModal() != wxID_OK) {
+ return;
+ }
- auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true);
- bool const kdm_matches_any_cpl = std::any_of(cpls.begin(), cpls.end(), [kdm](shared_ptr<const dcp::CPL> cpl) { return cpl->id() == kdm->cpl_id(); });
- bool const kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get();
+ optional<dcp::EncryptedKDM> kdm;
+ try {
+ kdm = dcp::EncryptedKDM (dcp::file_to_string(wx_to_std(d->GetPath()), MAX_KDM_SIZE));
+ } catch (exception& e) {
+ error_dialog (_parent, _("Could not load KDM"), std_to_wx(e.what()));
+ return;
+ }
- if (!kdm_matches_any_cpl) {
- error_dialog (_parent, _("This KDM was not made for this DCP. You will need a different one."));
- return;
- }
+ /* Try to decrypt it to get an early preview of any errors */
+ try {
+ decrypt_kdm_with_helpful_error (*kdm);
+ } catch (KDMError& e) {
+ error_dialog (_parent, std_to_wx(e.summary()), std_to_wx(e.detail()));
+ return;
+ } catch (exception& e) {
+ error_dialog (_parent, e.what());
+ return;
+ }
- if (!kdm_matches_selected_cpl && kdm_matches_any_cpl) {
- message_dialog (_parent, _("This KDM was made for one of the CPLs in this DCP, but not the currently selected one. To play the currently-selected CPL you will need a different KDM."));
- }
+ auto cpls = dcp::find_and_resolve_cpls (dcp->directories(), true);
+ bool const kdm_matches_any_cpl = std::any_of(cpls.begin(), cpls.end(), [kdm](shared_ptr<const dcp::CPL> cpl) { return cpl->id() == kdm->cpl_id(); });
+ bool const kdm_matches_selected_cpl = dcp->cpl() || kdm->cpl_id() == dcp->cpl().get();
- dcp->add_kdm (*kdm);
+ if (!kdm_matches_any_cpl) {
+ error_dialog (_parent, _("This KDM was not made for this DCP. You will need a different one."));
+ return;
+ }
- auto film = _film.lock ();
- DCPOMATIC_ASSERT (film);
- JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
+ if (!kdm_matches_selected_cpl && kdm_matches_any_cpl) {
+ message_dialog (_parent, _("This KDM was made for one of the CPLs in this DCP, but not the currently selected one. To play the currently-selected CPL you will need a different KDM."));
}
- d->Destroy ();
+ dcp->add_kdm (*kdm);
+
+ auto film = _film.lock ();
+ DCPOMATIC_ASSERT (film);
+ JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
}
void
auto dcp = dynamic_pointer_cast<DCPContent> (_content.front());
DCPOMATIC_ASSERT (dcp);
- auto d = new wxDirDialog (_parent, _("Select OV"));
+ auto d = make_wx<wxDirDialog>(_parent, _("Select OV"));
if (d->ShowModal() == wxID_OK) {
dcp->add_ov (wx_to_std (d->GetPath()));
DCPOMATIC_ASSERT (film);
JobManager::instance()->add (make_shared<ExamineContentJob>(film, dcp));
}
-
- d->Destroy ();
}
void
{
auto film = _film.lock ();
DCPOMATIC_ASSERT (film);
- auto d = new ContentPropertiesDialog (_parent, film, _content.front());
+ auto d = make_wx<ContentPropertiesDialog>(_parent, film, _content.front());
d->ShowModal ();
- d->Destroy ();
}
void
ContentMenu::advanced ()
{
- auto d = new ContentAdvancedDialog (_parent, _content.front());
- d->ShowModal ();
- d->Destroy ();
+ DCPOMATIC_ASSERT(!_content.empty());
+
+ auto content = _content.front();
+ auto dialog = make_wx<ContentAdvancedDialog>(_parent, content);
+
+ if (dialog->ShowModal() == wxID_CANCEL) {
+ return;
+ }
+
+ if (content->video) {
+ content->video->set_use(!dialog->ignore_video());
+ content->video->set_burnt_subtitle_language(dialog->burnt_subtitle_language());
+ }
+
+ auto ffmpeg = dynamic_pointer_cast<FFmpegContent>(content);
+ if (ffmpeg) {
+ ffmpeg->set_filters(dialog->filters());
+ }
+
+ if (dialog->video_frame_rate()) {
+ auto film = _film.lock();
+ DCPOMATIC_ASSERT(film);
+ content->set_video_frame_rate(film, *dialog->video_frame_rate());
+ } else {
+ content->unset_video_frame_rate();
+ }
}
auto film = _film.lock ();
DCPOMATIC_ASSERT (film);
- auto viewer = _viewer.lock ();
- DCPOMATIC_ASSERT (viewer);
auto update_viewer = [this](Crop crop) {
auto film = _film.lock();
DCPOMATIC_ASSERT (film);
- auto viewer = _viewer.lock ();
- DCPOMATIC_ASSERT (viewer);
auto const content = _content.front();
auto const current_crop = content->video->actual_crop();
- viewer->set_crop_guess (
+ _viewer.set_crop_guess(
dcpomatic::Rect<float>(
static_cast<float>(std::max(0, crop.left - current_crop.left)) / content->video->size().width,
static_cast<float>(std::max(0, crop.top - current_crop.top)) / content->video->size().height,
));
};
- auto guess_crop_for_content = [this, film, viewer]() {
- auto position = viewer->position_in_content(_content.front()).get_value_or(
+ auto guess_crop_for_content = [this, film]() {
+ auto position = _viewer.position_in_content(_content.front()).get_value_or(
ContentTime::from_frames(_content.front()->video->length(), _content.front()->video_frame_rate().get_value_or(24))
);
return guess_crop(film, _content.front(), Config::instance()->auto_crop_threshold(), position);
auto const crop = guess_crop_for_content ();
update_viewer (crop);
- if (_auto_crop_dialog) {
- _auto_crop_dialog->Destroy();
- _auto_crop_dialog = nullptr;
- }
- _auto_crop_dialog = new AutoCropDialog (_parent, crop);
+ _auto_crop_dialog.reset(_parent, crop);
_auto_crop_dialog->Show ();
/* Update the dialog and view when the crop threshold changes */
});
/* Also update the dialog and view when we're looking at a different frame */
- _auto_crop_viewer_connection =
viewer->ImageChanged.connect([this, guess_crop_for_content, update_viewer](shared_ptr<PlayerVideo>) {
+ _auto_crop_viewer_connection =
_viewer.ImageChanged.connect([this, guess_crop_for_content, update_viewer](shared_ptr<PlayerVideo>) {
auto const crop = guess_crop_for_content();
_auto_crop_dialog->set(crop);
update_viewer(crop);
});
/* Handle the user closing the dialog (with OK or cancel) */
- _auto_crop_dialog->Bind (wxEVT_BUTTON, [this, viewer](wxCommandEvent& ev) {
+ _auto_crop_dialog->Bind(wxEVT_BUTTON, [this](wxCommandEvent& ev) {
_auto_crop_config_connection.disconnect ();
_auto_crop_viewer_connection.disconnect ();
if (ev.GetId() == wxID_OK) {
_content.front()->video->set_crop(_auto_crop_dialog->get());
}
_auto_crop_dialog->Show (false);
- viewer->unset_crop_guess ();
+ _viewer.unset_crop_guess ();
});
/* Update the view when something in the dialog is changed */
projects / dcpomatic.git / blobdiff