Merge master.

[dcpomatic.git] / src / wx / subtitle_panel.h

diff --git a/src/wx/subtitle_panel.h b/src/wx/subtitle_panel.h
index 3f795189593dba1972715760686d4149c7b7db48..1ee775025ae80710638f869c2488fb9366a1b182 100644 (file)
--- a/src/wx/subtitle_panel.h
+++ b/src/wx/subtitle_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 
 class wxCheckBox;
 class wxSpinCtrl;
+class SubtitleView;
 
 class SubtitlePanel : public FilmEditorPanel
 {
@@ -28,19 +29,24 @@ public:
        SubtitlePanel (FilmEditor *);
 
        void film_changed (Film::Property);
-       void film_content_changed (boost::shared_ptr<Content>, int);
-
+       void film_content_changed (int);
+       void content_selection_changed ();
        
 private:
        void with_subtitles_toggled ();
-       void offset_changed ();
+       void x_offset_changed ();
+       void y_offset_changed ();
        void scale_changed ();
        void stream_changed ();
+       void view_clicked ();
 
        void setup_sensitivity ();
        
        wxCheckBox* _with_subtitles;
-       wxSpinCtrl* _offset;
+       wxSpinCtrl* _x_offset;
+       wxSpinCtrl* _y_offset;
        wxSpinCtrl* _scale;
        wxChoice* _stream;
+       wxButton* _view_button;
+       SubtitleView* _view;
 };