X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=e19fcabdf81cd45db2fe0fd0ac8551a08b7c33d5;hb=91a3c1f1ea36e69a17d33a16bdd3087e7ed53455;hp=a198d7aa7d0ce221b0e246a13b3bd24bdd6667d6;hpb=22b9f3b2090d8bdfe52cda1e69d3acbe874f1ce5;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index a198d7aa7..e19fcabdf 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -16,21 +16,20 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
- 
-/** @file src/film_editor.h
- *  @brief A wx widget to edit a film's metadata, and perform various functions.
+
+/** @file src/wx/film_editor.h
+ *  @brief FilmEditor class.
  */
 
+#include "lib/film.h"
 #include <wx/wx.h>
 #include <boost/signals2.hpp>
-#include "lib/film.h"
 
 class wxNotebook;
-class wxSpinCtrl;
 class Film;
-class Ratio;
 class ContentPanel;
 class DCPPanel;
+class FilmViewer;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -38,7 +37,7 @@ class DCPPanel;
 class FilmEditor : public wxPanel
 {
 public:
-	FilmEditor (wxWindow *);
+	FilmEditor (wxWindow *, FilmViewer* viewer);
 
 	void set_film (boost::shared_ptr<Film>);
 
@@ -49,18 +48,17 @@ public:
 	ContentPanel* content_panel () const {
 		return _content_panel;
 	}
-	
+
 	boost::shared_ptr<Film> film () const {
 		return _film;
 	}
 
-private:
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
 	void film_content_changed (int);
 
 	void set_general_sensitivity (bool);
-	void active_jobs_changed (bool);
+	void active_jobs_changed (boost::optional<std::string>);
 
 	wxNotebook* _main_notebook;
 	ContentPanel* _content_panel;