Move _state_timer into VideoView.

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

diff --git a/src/wx/text_view.cc b/src/wx/text_view.cc
index 583632dd0ae9d0cedd6de021b27c176f2dbe2184..271e02d41a357a4050a27715362c0d921a0f0564 100644 (file)
--- a/src/wx/text_view.cc
+++ b/src/wx/text_view.cc
@@ -18,6 +18,9 @@
 
 */
 
+#include "text_view.h"
+#include "film_viewer.h"
+#include "wx_util.h"
 #include "lib/string_text_file_decoder.h"
 #include "lib/content_text.h"
 #include "lib/video_decoder.h"
@@ -26,16 +29,17 @@
 #include "lib/config.h"
 #include "lib/string_text_file_content.h"
 #include "lib/text_decoder.h"
-#include "text_view.h"
-#include "film_viewer.h"
-#include "wx_util.h"
 
 using std::list;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::bind;
 using boost::dynamic_pointer_cast;
+using namespace dcpomatic;
 
-TextView::TextView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> caption, shared_ptr<Decoder> decoder, FilmViewer* viewer)
+TextView::TextView (
+       wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content, shared_ptr<TextContent> text, shared_ptr<Decoder> decoder, weak_ptr<FilmViewer> viewer
+       )
        : wxDialog (parent, wxID_ANY, _("Captions"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
        , _content (content)
        , _film_viewer (viewer)
@@ -87,8 +91,8 @@ TextView::TextView (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content>
        _frc = film->active_frame_rate_change (content->position());
 
        /* Find the decoder that is being used for our TextContent and attach to it */
-       BOOST_FOREACH (shared_ptr<TextDecoder> i, decoder->caption) {
-               if (i->content() == caption) {
+       BOOST_FOREACH (shared_ptr<TextDecoder> i, decoder->text) {
+               if (i->content() == text) {
                        i->PlainStart.connect (bind (&TextView::data_start, this, _1));
                        i->Stop.connect (bind (&TextView::data_stop, this, _1));
                }
@@ -133,7 +137,9 @@ TextView::subtitle_selected (wxListEvent& ev)
        }
 
        DCPOMATIC_ASSERT (ev.GetIndex() < int(_start_times.size()));
-       shared_ptr<Content> locked = _content.lock ();
-       DCPOMATIC_ASSERT (locked);
-       _film_viewer->set_position (locked, _start_times[ev.GetIndex()]);
+       shared_ptr<Content> lc = _content.lock ();
+       DCPOMATIC_ASSERT (lc);
+       shared_ptr<FilmViewer> fv = _film_viewer.lock ();
+       DCPOMATIC_ASSERT (fv);
+       fv->seek (lc, _start_times[ev.GetIndex()], true);
 }