#include "lib/dcp_content.h"
#include "lib/film.h"
#include "lib/job_manager.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/notebook.h>
#include <wx/wx.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
using std::list;
#endif
-FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
+FilmEditor::FilmEditor(wxWindow* parent, FilmViewer& viewer)
: wxPanel (parent)
{
auto s = new wxBoxSizer (wxVERTICAL);
- _main_notebook = new wxNotebook (this, wxID_ANY);
- s->Add (_main_notebook, 1);
+ auto notebook = new wxNotebook(this, wxID_ANY);
+ s->Add(notebook, 1, wxEXPAND);
- _content_panel = new ContentPanel (_main_notebook, _film, viewer);
- _main_notebook->AddPage (_content_panel->window(), _("Content"), true);
- _dcp_panel = new DCPPanel (_main_notebook, _film, viewer);
- _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
+ _content_panel = new ContentPanel(notebook, _film, viewer);
+ notebook->AddPage(_content_panel->window(), _("Content"), true);
+ _dcp_panel = new DCPPanel(notebook, _film, viewer);
+ notebook->AddPage(_dcp_panel->panel (), _("DCP"), false);
JobManager::instance()->ActiveJobsChanged.connect (
bind(&FilmEditor::active_jobs_changed, this, _2)
* @param p Property of the Film that has changed.
*/
void
-FilmEditor::film_change (ChangeType type, Film::Property p)
+FilmEditor::film_change(ChangeType type, FilmProperty p)
{
if (type != ChangeType::DONE) {
return;
_content_panel->film_changed (p);
_dcp_panel->film_changed (p);
- if (p == Film::Property::CONTENT && !_film->content().empty()) {
+ if (p == FilmProperty::CONTENT && !_film->content().empty()) {
/* Select newly-added content */
_content_panel->set_selection (_film->content().back ());
}
_dcp_panel->set_film (_film);
if (!_film) {
- FileChanged ("");
return;
}
_film->Change.connect (bind(&FilmEditor::film_change, this, _1, _2));
_film->ContentChange.connect (bind(&FilmEditor::film_content_change, this, _1, _3));
- if (_film->directory()) {
- FileChanged (_film->directory().get());
- } else {
- FileChanged ("");
- }
-
if (!_film->content().empty()) {
_content_panel->set_selection (_film->content().front());
}