/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 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.
- 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 <http://www.gnu.org/licenses/>.
*/
+
/** @file src/wx/film_editor.cc
* @brief FilmEditor class.
*/
-#include "lib/film.h"
-#include "lib/job_manager.h"
+
+#include "content_panel.h"
+#include "dcp_panel.h"
+#include "film_editor.h"
+#include "wx_util.h"
#include "lib/content.h"
#include "lib/dcp_content.h"
-#include "wx_util.h"
-#include "film_editor.h"
-#include "dcp_panel.h"
-#include "content_panel.h"
-#include <wx/wx.h>
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/notebook.h>
-#include <iostream>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
+
+using std::list;
+using std::shared_ptr;
+using std::string;
+using std::weak_ptr;
+using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
-using std::cout;
-using boost::shared_ptr;
-/** @param f Film to edit */
-FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
+FilmEditor::FilmEditor(wxWindow* parent, FilmViewer& viewer)
: wxPanel (parent)
{
- wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
+ 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(notebook, _film, viewer);
+ notebook->AddPage(_content_panel->window(), _("Content"), true);
+ _dcp_panel = new DCPPanel(notebook, _film, viewer);
+ notebook->AddPage(_dcp_panel->panel (), _("DCP"), false);
- _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 (_dcp_panel->panel (), _("DCP"), false);
-
JobManager::instance()->ActiveJobsChanged.connect (
- bind (&FilmEditor::active_jobs_changed, this, _1)
+ bind(&FilmEditor::active_jobs_changed, this, _2)
);
set_film (shared_ptr<Film> ());
* @param p Property of the Film that has changed.
*/
void
-FilmEditor::film_changed (Film::Property p)
+FilmEditor::film_change(ChangeType type, FilmProperty p)
{
+ if (type != ChangeType::DONE) {
+ return;
+ }
+
ensure_ui_thread ();
-
+
if (!_film) {
return;
}
_content_panel->film_changed (p);
_dcp_panel->film_changed (p);
- if (p == Film::CONTENT && !_film->content().empty ()) {
+ if (p == FilmProperty::CONTENT && !_film->content().empty()) {
/* Select newly-added content */
_content_panel->set_selection (_film->content().back ());
}
}
+
void
-FilmEditor::film_content_changed (int property)
+FilmEditor::film_content_change (ChangeType type, int property)
{
+ if (type != ChangeType::DONE) {
+ return;
+ }
+
ensure_ui_thread ();
-
+
if (!_film) {
/* We call this method ourselves (as well as using it as a signal handler)
so _film can be 0.
_dcp_panel->film_content_changed (property);
}
+
/** Sets the Film that we are editing */
void
-FilmEditor::set_film (shared_ptr<Film> f)
+FilmEditor::set_film (shared_ptr<Film> film)
{
- set_general_sensitivity (f != 0);
+ set_general_sensitivity (film != nullptr);
- if (_film == f) {
+ if (_film == film) {
return;
}
-
- _film = f;
+
+ _film = film;
_content_panel->set_film (_film);
_dcp_panel->set_film (_film);
- if (_film) {
- _film->Changed.connect (bind (&FilmEditor::film_changed, this, _1));
- _film->ContentChanged.connect (bind (&FilmEditor::film_content_changed, this, _2));
+ if (!_film) {
+ return;
}
- if (_film) {
- FileChanged (_film->directory ());
- } else {
- FileChanged ("");
- }
+ _film->Change.connect (bind(&FilmEditor::film_change, this, _1, _2));
+ _film->ContentChange.connect (bind(&FilmEditor::film_content_change, this, _1, _3));
- if (!_film->content().empty ()) {
- _content_panel->set_selection (_film->content().front ());
+ if (!_film->content().empty()) {
+ _content_panel->set_selection (_film->content().front());
}
}
+
void
FilmEditor::set_general_sensitivity (bool s)
{
_dcp_panel->set_general_sensitivity (s);
}
+
+void
+FilmEditor::active_jobs_changed (optional<string> j)
+{
+ set_general_sensitivity (!j);
+}
+
+
void
-FilmEditor::active_jobs_changed (bool a)
+FilmEditor::first_shown ()
{
- set_general_sensitivity (!a);
+ _content_panel->first_shown ();
}
+
projects / dcpomatic.git / blobdiff