X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftiming_panel.cc;h=a78e3bdd4fe04f82bf027360cb13074b6777d48b;hb=60a864b0b9985f9e84db7028d5b9a523ecfde522;hp=ecf55640dc3f7cd5655ea482cfe639c4920293c1;hpb=a5d004b0773f633401528392fc28e66d70e13ac8;p=dcpomatic.git diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc index ecf55640d..a78e3bdd4 100644 --- a/src/wx/timing_panel.cc +++ b/src/wx/timing_panel.cc @@ -18,35 +18,35 @@ */ -#include "timing_panel.h" -#include "wx_util.h" -#include "film_viewer.h" -#include "timecode.h" + #include "content_panel.h" +#include "dcpomatic_button.h" +#include "film_viewer.h" #include "move_to_dialog.h" #include "static_text.h" -#include "dcpomatic_button.h" +#include "timecode.h" +#include "timing_panel.h" +#include "wx_util.h" +#include "lib/audio_content.h" #include "lib/content.h" -#include "lib/image_content.h" -#include "lib/text_content.h" +#include "lib/dcp_content.h" #include "lib/dcp_subtitle_content.h" -#include "lib/audio_content.h" +#include "lib/ffmpeg_content.h" +#include "lib/image_content.h" #include "lib/string_text_file_content.h" +#include "lib/text_content.h" #include "lib/video_content.h" -#include "lib/dcp_content.h" -#include "lib/ffmpeg_content.h" #include -#include "lib/warnings.h" +#include #if defined(__WXGTK20__) && !defined(__WXGTK3__) #define TIMING_PANEL_ALIGNMENT_HACK 1 -DCPOMATIC_DISABLE_WARNINGS +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #endif #include -#include -using std::cout; + using std::string; using std::set; using std::shared_ptr; @@ -59,12 +59,20 @@ using namespace boost::placeholders; using dcp::locale_convert; using namespace dcpomatic; -TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) + +TimingPanel::TimingPanel (ContentPanel* p, FilmViewer& viewer) /* horrid hack for apparent lack of context support with wxWidgets i18n code */ /// TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix : ContentSubPanel (p, S_("Timing|Timing")) , _viewer (viewer) , _film_content_changed_suspender (boost::bind(&TimingPanel::film_content_changed, this, _1)) +{ + +} + + +void +TimingPanel::create () { wxSize size = TimecodeBase::size (this); @@ -117,12 +125,12 @@ TimingPanel::TimingPanel (ContentPanel* p, weak_ptr viewer) _trim_end_to_playhead->Bind (wxEVT_BUTTON, boost::bind (&TimingPanel::trim_end_to_playhead_clicked, this)); _play_length->Changed.connect (boost::bind (&TimingPanel::play_length_changed, this)); - shared_ptr fv = _viewer.lock (); - DCPOMATIC_ASSERT (fv); - fv->ImageChanged.connect (boost::bind (&TimingPanel::setup_sensitivity, this)); + _viewer.ImageChanged.connect(boost::bind(&TimingPanel::setup_sensitivity, this)); setup_sensitivity (); add_to_grid (); + + _sizer->Layout (); } void @@ -336,14 +344,9 @@ TimingPanel::full_length_changed () void TimingPanel::trim_start_changed () { - shared_ptr fv = _viewer.lock (); - if (!fv) { - return; - } + DCPTime const ph = _viewer.position(); - DCPTime const ph = fv->position (); - - fv->set_coalesce_player_changes (true); + _viewer.set_coalesce_player_changes(true); shared_ptr ref; optional ref_frc; @@ -366,21 +369,16 @@ TimingPanel::trim_start_changed () } if (ref) { - fv->seek (max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true); + _viewer.seek(max(DCPTime(), ref_ph.get() + ref->position() - DCPTime(ref->trim_start(), ref_frc.get())), true); } - fv->set_coalesce_player_changes (false); + _viewer.set_coalesce_player_changes(false); } void TimingPanel::trim_end_changed () { - shared_ptr fv = _viewer.lock (); - if (!fv) { - return; - } - - fv->set_coalesce_player_changes (true); + _viewer.set_coalesce_player_changes(true); Suspender::Block bl = _film_content_changed_suspender.block (); for (auto i: _parent->selected()) { @@ -389,11 +387,11 @@ TimingPanel::trim_end_changed () } /* XXX: maybe playhead-off-the-end-of-the-film should be handled elsewhere */ - if (fv->position() >= _parent->film()->length()) { - fv->seek (_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true); + if (_viewer.position() >= _parent->film()->length()) { + _viewer.seek(_parent->film()->length() - DCPTime::from_frames(1, _parent->film()->video_frame_rate()), true); } - fv->set_coalesce_player_changes (false); + _viewer.set_coalesce_player_changes(false); } void @@ -403,9 +401,8 @@ TimingPanel::play_length_changed () Suspender::Block bl = _film_content_changed_suspender.block (); for (auto i: _parent->selected()) { FrameRateChange const frc = _parent->film()->active_frame_rate_change (i->position ()); - i->set_trim_end ( - ContentTime (max(DCPTime(), i->full_length(_parent->film()) - play_length), frc) - i->trim_start() - ); + auto dcp = max(DCPTime(), i->full_length(_parent->film()) - play_length); + i->set_trim_end (max(ContentTime(), ContentTime(dcp, frc) - i->trim_start())); } } @@ -425,7 +422,7 @@ TimingPanel::content_selection_changed () void TimingPanel::film_changed (Film::Property p) { - if (p == Film::VIDEO_FRAME_RATE) { + if (p == Film::Property::VIDEO_FRAME_RATE) { update_full_length (); update_play_length (); } @@ -434,16 +431,11 @@ TimingPanel::film_changed (Film::Property p) void TimingPanel::trim_start_to_playhead_clicked () { - shared_ptr fv = _viewer.lock (); - if (!fv) { - return; - } - - shared_ptr film = _parent->film (); - DCPTime const ph = fv->position().floor (film->video_frame_rate ()); + auto film = _parent->film (); + DCPTime const ph = _viewer.position().floor(film->video_frame_rate()); optional new_ph; - fv->set_coalesce_player_changes (true); + _viewer.set_coalesce_player_changes(true); for (auto i: _parent->selected()) { if (i->position() < ph && ph < i->end(film)) { @@ -453,23 +445,18 @@ TimingPanel::trim_start_to_playhead_clicked () } } - fv->set_coalesce_player_changes (false); + _viewer.set_coalesce_player_changes(false); if (new_ph) { - fv->seek (new_ph.get(), true); + _viewer.seek(new_ph.get(), true); } } void TimingPanel::trim_end_to_playhead_clicked () { - shared_ptr fv = _viewer.lock (); - if (!fv) { - return; - } - - shared_ptr film = _parent->film (); - DCPTime const ph = fv->position().floor (film->video_frame_rate ()); + auto film = _parent->film (); + auto const ph = _viewer.position().floor(film->video_frame_rate()); for (auto i: _parent->selected()) { if (i->position() < ph && ph < i->end(film)) { FrameRateChange const frc = film->active_frame_rate_change (i->position ()); @@ -490,9 +477,7 @@ TimingPanel::setup_sensitivity () _trim_end->Enable (e); _play_length->Enable (e); - shared_ptr fv = _viewer.lock (); - DCPOMATIC_ASSERT (fv); - DCPTime const ph = fv->position (); + auto const ph = _viewer.position(); bool any_over_ph = false; for (auto i: _parent->selected()) { if (i->position() <= ph && ph < i->end(_parent->film())) { @@ -521,7 +506,7 @@ TimingPanel::move_to_start_of_reel_clicked () } } - MoveToDialog* d = new MoveToDialog (this, position, _parent->film()); + auto d = new MoveToDialog(this, position, _parent->film()); if (d->ShowModal() == wxID_OK) { for (auto i: _parent->selected()) {