projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op: remove all trailing whitespace.
[dcpomatic.git]
/
src
/
wx
/
film_editor.h
diff --git
a/src/wx/film_editor.h
b/src/wx/film_editor.h
index 28baf410c6fe5f9d627de23fceaeee4d07fcc01c..43a1214c2c915aad424bd63178c8852201cb823f 100644
(file)
--- a/
src/wx/film_editor.h
+++ b/
src/wx/film_editor.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
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
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.
*/
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 function
s.
+
+/** @file src/
wx/
film_editor.h
+ * @brief
FilmEditor clas
s.
*/
*/
+#include "lib/film.h"
#include <wx/wx.h>
#include <boost/signals2.hpp>
#include <wx/wx.h>
#include <boost/signals2.hpp>
-#include "lib/film.h"
class wxNotebook;
class wxNotebook;
-class wxSpinCtrl;
class Film;
class Film;
-class Ratio;
class ContentPanel;
class DCPPanel;
class ContentPanel;
class DCPPanel;
+class FilmViewer;
/** @class FilmEditor
* @brief A wx widget to edit a film's metadata, and perform various functions.
/** @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:
class FilmEditor : public wxPanel
{
public:
- FilmEditor (
boost::shared_ptr<Film>, wxWindow *
);
+ FilmEditor (
wxWindow *, FilmViewer* viewer
);
void set_film (boost::shared_ptr<Film>);
void set_film (boost::shared_ptr<Film>);
@@
-49,12
+48,11
@@
public:
ContentPanel* content_panel () const {
return _content_panel;
}
ContentPanel* content_panel () const {
return _content_panel;
}
-
+
boost::shared_ptr<Film> film () const {
return _film;
}
boost::shared_ptr<Film> film () const {
return _film;
}
-private:
/* Handle changes to the model */
void film_changed (Film::Property);
void film_content_changed (int);
/* Handle changes to the model */
void film_changed (Film::Property);
void film_content_changed (int);