projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
wx
/
film_editor.h
diff --git
a/src/wx/film_editor.h
b/src/wx/film_editor.h
index b311184fae003a73bf5da5dd6e39c29abea89f07..47b333519de266acf98dfec7d3792b80ce4385e5 100644
(file)
--- a/
src/wx/film_editor.h
+++ b/
src/wx/film_editor.h
@@
-1,36
+1,36
@@
/*
/*
- 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
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
-
-/** @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 wxSpinCtrl;
class wxNotebook;
class Film;
class wxNotebook;
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
+38,7
@@
class DCPPanel;
class FilmEditor : public wxPanel
{
public:
class FilmEditor : public wxPanel
{
public:
- FilmEditor (wxWindow *);
+ FilmEditor (wxWindow *
, FilmViewer* viewer
);
void set_film (boost::shared_ptr<Film>);
void set_film (boost::shared_ptr<Film>);
@@
-49,18
+49,17
@@
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);
void set_general_sensitivity (bool);
/* Handle changes to the model */
void film_changed (Film::Property);
void film_content_changed (int);
void set_general_sensitivity (bool);
- void active_jobs_changed (boo
l
);
+ void active_jobs_changed (boo
st::optional<std::string>
);
wxNotebook* _main_notebook;
ContentPanel* _content_panel;
wxNotebook* _main_notebook;
ContentPanel* _content_panel;