X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=a017175f522106d4663f1b98d37087d9e2304d19;hp=37a8c880847391eb68d29bdbe7063c5940c4a7cc;hb=d9c2cf78e6c5e465e7f76020f78f7ed1e71c3bc0;hpb=19b94af9524a953827ed4e202bfa986e717fd99a diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 37a8c8808..a017175f5 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -1,77 +1,48 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2016 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 . */ -/** @file src/film_editor.cc - * @brief A wx widget to edit a film's metadata, and perform various functions. +/** @file src/wx/film_editor.cc + * @brief FilmEditor class. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include "wx_util.h" +#include "film_editor.h" +#include "dcp_panel.h" +#include "content_panel.h" #include "lib/film.h" -#include "lib/transcode_job.h" -#include "lib/exceptions.h" #include "lib/job_manager.h" -#include "lib/filter.h" -#include "lib/ratio.h" -#include "lib/config.h" -#include "lib/image_content.h" -#include "lib/ffmpeg_content.h" -#include "lib/sndfile_content.h" -#include "lib/dcp_content_type.h" -#include "lib/scaler.h" -#include "lib/playlist.h" #include "lib/content.h" -#include "lib/content_factory.h" #include "lib/dcp_content.h" -#include "timecode.h" -#include "wx_util.h" -#include "film_editor.h" -#include "timeline_dialog.h" -#include "timing_panel.h" -#include "subtitle_panel.h" -#include "audio_panel.h" -#include "video_panel.h" -#include "content_panel.h" -#include "dcp_panel.h" +#include +#include +#include +#include -using std::string; using std::cout; -using std::stringstream; -using std::pair; -using std::fixed; -using std::setprecision; +using std::string; using std::list; -using std::vector; -using std::max; using boost::shared_ptr; using boost::weak_ptr; -using boost::dynamic_pointer_cast; -using boost::lexical_cast; +using boost::optional; -/** @param f Film to edit */ -FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) +FilmEditor::FilmEditor (wxWindow* parent, weak_ptr viewer) : wxPanel (parent) { wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); @@ -79,17 +50,16 @@ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) _main_notebook = new wxNotebook (this, wxID_ANY); s->Add (_main_notebook, 1); - _content_panel = new ContentPanel (_main_notebook, _film); - _main_notebook->AddPage (_content_panel->panel (), _("Content"), true); + _content_panel = new ContentPanel (_main_notebook, _film, viewer); + _main_notebook->AddPage (_content_panel->window(), _("Content"), true); _dcp_panel = new DCPPanel (_main_notebook, _film); _main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false); - - set_film (f); JobManager::instance()->ActiveJobsChanged.connect ( - bind (&FilmEditor::active_jobs_changed, this, _1) + bind (&FilmEditor::active_jobs_changed, this, _2) ); + set_film (shared_ptr ()); SetSizerAndFit (s); } @@ -99,10 +69,14 @@ FilmEditor::FilmEditor (shared_ptr f, wxWindow* parent) * @param p Property of the Film that has changed. */ void -FilmEditor::film_changed (Film::Property p) +FilmEditor::film_change (ChangeType type, Film::Property p) { + if (type != CHANGE_TYPE_DONE) { + return; + } + ensure_ui_thread (); - + if (!_film) { return; } @@ -110,13 +84,21 @@ FilmEditor::film_changed (Film::Property p) _content_panel->film_changed (p); _dcp_panel->film_changed (p); + if (p == Film::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 != CHANGE_TYPE_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. @@ -130,31 +112,34 @@ FilmEditor::film_content_changed (int property) /** Sets the Film that we are editing */ void -FilmEditor::set_film (shared_ptr f) +FilmEditor::set_film (shared_ptr film) { - set_general_sensitivity (f != 0); + set_general_sensitivity (film != 0); - 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) { + FileChanged (""); + return; } - if (_film) { - FileChanged (_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 ()); } } @@ -167,8 +152,7 @@ FilmEditor::set_general_sensitivity (bool s) } void -FilmEditor::active_jobs_changed (bool a) +FilmEditor::active_jobs_changed (optional j) { - set_general_sensitivity (!a); + set_general_sensitivity (!j); } -