Cleanup: remove some unnecessary includes.

[dcpomatic.git] / src / wx / timing_panel.cc

diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 1f2928e018c588c33f7bc0807ff692c62dda92c4..890049ae92826657d66e5a602c8e6aa4787ab04b 100644 (file)
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -18,35 +18,36 @@
 
 */
 
-#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/scope_guard.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 <dcp/locale_convert.h>
-#include "lib/warnings.h"
+#include <dcp/warnings.h>
 #if defined(__WXGTK20__) && !defined(__WXGTK3__)
 #define TIMING_PANEL_ALIGNMENT_HACK 1
-DCPOMATIC_DISABLE_WARNINGS
+LIBDCP_DISABLE_WARNINGS
 #include <gtk/gtk.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 #endif
 #include <set>
-#include <iostream>
 
-using std::cout;
+
 using std::string;
 using std::set;
 using std::shared_ptr;
@@ -59,7 +60,8 @@ using namespace boost::placeholders;
 using dcp::locale_convert;
 using namespace dcpomatic;
 
-TimingPanel::TimingPanel (ContentPanel* p, weak_ptr<FilmViewer> 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"))
@@ -124,9 +126,7 @@ TimingPanel::create ()
        _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<FilmViewer> 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 ();
@@ -345,14 +345,9 @@ TimingPanel::full_length_changed ()
 void
 TimingPanel::trim_start_changed ()
 {
-       shared_ptr<FilmViewer> 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<Content> ref;
        optional<FrameRateChange> ref_frc;
@@ -371,25 +366,20 @@ TimingPanel::trim_start_changed ()
                }
 
                ContentTime const trim = _trim_start->get (i->video_frame_rate().get_value_or(_parent->film()->video_frame_rate()));
-               i->set_trim_start (trim);
+               i->set_trim_start(_parent->film(), trim);
        }
 
        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<FilmViewer> 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()) {
@@ -398,11 +388,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
@@ -412,9 +402,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()));
        }
 }
 
@@ -443,42 +432,32 @@ TimingPanel::film_changed (Film::Property p)
 void
 TimingPanel::trim_start_to_playhead_clicked ()
 {
-       shared_ptr<FilmViewer> fv = _viewer.lock ();
-       if (!fv) {
-               return;
-       }
-
-       shared_ptr<const Film> 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<DCPTime> 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)) {
                        FrameRateChange const frc = film->active_frame_rate_change (i->position());
-                       i->set_trim_start (i->trim_start() + ContentTime (ph - i->position(), frc));
+                       i->set_trim_start(film, i->trim_start() + ContentTime(ph - i->position(), frc));
                        new_ph = i->position ();
                }
        }
 
-       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<FilmViewer> fv = _viewer.lock ();
-       if (!fv) {
-               return;
-       }
-
-       shared_ptr<const Film> 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 ());
@@ -499,9 +478,7 @@ TimingPanel::setup_sensitivity ()
        _trim_end->Enable (e);
        _play_length->Enable (e);
 
-       shared_ptr<FilmViewer> 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())) {
@@ -530,12 +507,11 @@ TimingPanel::move_to_start_of_reel_clicked ()
                }
        }
 
-       MoveToDialog* d = new MoveToDialog (this, position, _parent->film());
+       auto d = make_wx<MoveToDialog>(this, position, _parent->film());
 
        if (d->ShowModal() == wxID_OK) {
                for (auto i: _parent->selected()) {
                        i->set_position (_parent->film(), d->position());
                }
        }
-       d->Destroy ();
 }