using std::string;
using std::list;
using boost::shared_ptr;
+using boost::weak_ptr;
using boost::optional;
-FilmEditor::FilmEditor (wxWindow* parent, ControlFilmViewer* viewer)
+FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
: wxPanel (parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
s->Add (_main_notebook, 1);
_content_panel = new ContentPanel (_main_notebook, _film, viewer);
- _main_notebook->AddPage (_content_panel->panel (), _("Content"), true);
- _dcp_panel = new DCPPanel (_main_notebook, _film);
+ _main_notebook->AddPage (_content_panel->window(), _("Content"), true);
+ _dcp_panel = new DCPPanel (_main_notebook, _film, viewer);
_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
JobManager::instance()->ActiveJobsChanged.connect (
_content_panel->set_film (_film);
_dcp_panel->set_film (_film);
- if (_film) {
- _film->Change.connect (bind (&FilmEditor::film_change, this, _1, _2));
- _film->ContentChange.connect (bind (&FilmEditor::film_content_change, this, _1, _3));
+ if (!_film) {
+ FileChanged ("");
+ return;
}
- if (_film && _film->directory()) {
+ _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 ()) {
+ if (!_film->content().empty()) {
_content_panel->set_selection (_film->content().front ());
}
}