X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fsubtitle_panel.h;h=1ee775025ae80710638f869c2488fb9366a1b182;hb=04533b9cf34ce8089113015715083ee9c5b2b001;hp=b4b20240e00798865ab72ff27670798fcac7741d;hpb=498e3c0ee1da5a4f50bc019e9a760689a930c06c;p=dcpomatic.git

diff --git a/src/wx/subtitle_panel.h b/src/wx/subtitle_panel.h
index b4b20240e..1ee775025 100644
--- 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,22 +29,24 @@ public:
 	SubtitlePanel (FilmEditor *);
 
 	void film_changed (Film::Property);
-	void film_content_changed (
-		boost::shared_ptr<Content>,
-		boost::shared_ptr<SubtitleContent>,
-		boost::shared_ptr<FFmpegContent>,
-		int);
-
-	void setup_control_sensitivity ();
+	void film_content_changed (int);
+	void content_selection_changed ();
 	
 private:
-	void with_subtitles_toggled (wxCommandEvent &);
-	void offset_changed (wxCommandEvent &);
-	void scale_changed (wxCommandEvent &);
-	void stream_changed (wxCommandEvent &);
+	void with_subtitles_toggled ();
+	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;
 };