X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=0e61f4898f7577dbcae7871b7ac0c18ba7850544;hb=563fc75855b9649cf135cf137cc1b0c43ebc8286;hp=43a1214c2c915aad424bd63178c8852201cb823f;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index 43a1214c2..0e61f4898 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -1,19 +1,20 @@ /* Copyright (C) 2012-2015 Carl Hetherington - 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. - 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 - 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 . */ @@ -22,7 +23,10 @@ */ #include "lib/film.h" +#include "lib/warnings.h" +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS #include class wxNotebook; @@ -37,11 +41,13 @@ class FilmViewer; class FilmEditor : public wxPanel { public: - FilmEditor (wxWindow *, FilmViewer* viewer); + FilmEditor (wxWindow *, boost::weak_ptr viewer); void set_film (boost::shared_ptr); + void first_shown (); boost::signals2::signal FileChanged; + boost::signals2::signal SelectionChanged; /* Stuff for panels */ @@ -54,11 +60,11 @@ public: } /* Handle changes to the model */ - void film_changed (Film::Property); - void film_content_changed (int); + void film_change (ChangeType, Film::Property); + void film_content_change (ChangeType type, int); void set_general_sensitivity (bool); - void active_jobs_changed (bool); + void active_jobs_changed (boost::optional); wxNotebook* _main_notebook; ContentPanel* _content_panel;