*/
#include "lib/content_text.h"
-#include <boost/shared_ptr.hpp>
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/listctrl.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
class Decoder;
-class ControlFilmViewer;
+class FilmViewer;
+class Film;
class TextView : public wxDialog
{
public:
TextView (
wxWindow *,
- boost::shared_ptr<Film>,
- boost::shared_ptr<Content> content,
- boost::shared_ptr<TextContent> caption,
- boost::shared_ptr<Decoder>,
- ControlFilmViewer* viewer
+ std::shared_ptr<Film>,
+ std::shared_ptr<Content> content,
+ std::shared_ptr<TextContent> caption,
+ std::shared_ptr<Decoder>,
+ std::weak_ptr<FilmViewer> viewer
);
private:
void data_start (ContentStringText cts);
- void data_stop (ContentTime time);
+ void data_stop (dcpomatic::ContentTime time);
void subtitle_selected (wxListEvent &);
wxListCtrl* _list;
int _subs;
boost::optional<FrameRateChange> _frc;
boost::optional<int> _last_count;
- std::vector<ContentTime> _start_times;
- boost::weak_ptr<Content> _content;
- ControlFilmViewer* _film_viewer;
+ std::vector<dcpomatic::ContentTime> _start_times;
+ std::weak_ptr<Content> _content;
+ std::weak_ptr<FilmViewer> _film_viewer;
};