Add a little gap between player buttons and the position slider.

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

diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index 4a39b913976eba1476bc3a5bb123a006e37928ed..7e526788651794a717e38c75deba15741f249418 100644 (file)
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -35,7 +35,6 @@
 using std::dynamic_pointer_cast;
 using std::list;
 using std::shared_ptr;
-using std::weak_ptr;
 using boost::bind;
 using namespace dcpomatic;
 #if BOOST_VERSION >= 106100
@@ -44,7 +43,7 @@ using namespace boost::placeholders;
 
 
 TextView::TextView (
-       wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, weak_ptr<FilmViewer> viewer
+       wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, FilmViewer& viewer
        )
        : wxDialog (parent, wxID_ANY, _("Captions"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
        , _content (content)
@@ -148,8 +147,6 @@ TextView::subtitle_selected (wxListEvent& ev)
        DCPOMATIC_ASSERT (ev.GetIndex() < int(_start_times.size()));
        auto lc = _content.lock ();
        DCPOMATIC_ASSERT (lc);
-       auto fv = _film_viewer.lock ();
-       DCPOMATIC_ASSERT (fv);
        /* Add on a frame here to work around any rounding errors and make sure land in the subtitle */
-       fv->seek (lc, _start_times[ev.GetIndex()] + ContentTime::from_frames(1, _frc->source), true);
+       _film_viewer.seek(lc, _start_times[ev.GetIndex()] + ContentTime::from_frames(1, _frc->source), true);
 }