projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
wx
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index bbfafa8c5595900a15df507036cfa88ec9c6e454..767676fff100c76260fbd6ac083f446dd9d94e16 100644
(file)
--- a/
src/wx/film_editor.cc
+++ b/
src/wx/film_editor.cc
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
6
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.
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
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/>.
*/
*/
@@
-21,23
+22,29
@@
* @brief FilmEditor class.
*/
* @brief FilmEditor class.
*/
-#include "lib/film.h"
-#include "lib/job_manager.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_util.h"
#include "film_editor.h"
#include "dcp_panel.h"
#include "content_panel.h"
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include "lib/content.h"
+#include "lib/dcp_content.h"
#include <wx/wx.h>
#include <wx/notebook.h>
#include <iostream>
using std::cout;
#include <wx/wx.h>
#include <wx/notebook.h>
#include <iostream>
using std::cout;
-using boost::shared_ptr;
-
-/** @param f Film to edit */
-FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
+using std::string;
+using std::list;
+using std::shared_ptr;
+using std::weak_ptr;
+using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
+FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
: wxPanel (parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
: wxPanel (parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@
-46,12
+53,12
@@
FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
s->Add (_main_notebook, 1);
_content_panel = new ContentPanel (_main_notebook, _film, viewer);
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);
_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
-
+
JobManager::instance()->ActiveJobsChanged.connect (
JobManager::instance()->ActiveJobsChanged.connect (
- bind (&FilmEditor::active_jobs_changed, this, _
1
)
+ bind (&FilmEditor::active_jobs_changed, this, _
2
)
);
set_film (shared_ptr<Film> ());
);
set_film (shared_ptr<Film> ());
@@
-64,23
+71,36
@@
FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
* @param p Property of the Film that has changed.
*/
void
* @param p Property of the Film that has changed.
*/
void
-FilmEditor::film_change
d (
Film::Property p)
+FilmEditor::film_change
(ChangeType type,
Film::Property p)
{
{
+ if (type != ChangeType::DONE) {
+ return;
+ }
+
ensure_ui_thread ();
ensure_ui_thread ();
-
+
if (!_film) {
return;
}
_content_panel->film_changed (p);
_dcp_panel->film_changed (p);
if (!_film) {
return;
}
_content_panel->film_changed (p);
_dcp_panel->film_changed (p);
+
+ if (p == Film::Property::CONTENT && !_film->content().empty()) {
+ /* Select newly-added content */
+ _content_panel->set_selection (_film->content().back ());
+ }
}
void
}
void
-FilmEditor::film_content_change
d (
int property)
+FilmEditor::film_content_change
(ChangeType type,
int property)
{
{
+ if (type != ChangeType::DONE) {
+ return;
+ }
+
ensure_ui_thread ();
ensure_ui_thread ();
-
+
if (!_film) {
/* We call this method ourselves (as well as using it as a signal handler)
so _film can be 0.
if (!_film) {
/* We call this method ourselves (as well as using it as a signal handler)
so _film can be 0.
@@
-94,31
+114,34
@@
FilmEditor::film_content_changed (int property)
/** Sets the Film that we are editing */
void
/** Sets the Film that we are editing */
void
-FilmEditor::set_film (shared_ptr<Film> f)
+FilmEditor::set_film (shared_ptr<Film> f
ilm
)
{
{
- set_general_sensitivity (f != 0);
+ set_general_sensitivity (f
ilm
!= 0);
- if (_film == f) {
+ if (_film == f
ilm
) {
return;
}
return;
}
-
- _film = f;
+
+ _film = f
ilm
;
_content_panel->set_film (_film);
_dcp_panel->set_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 ("");
}
} else {
FileChanged ("");
}
- if (!_film->content().empty
()) {
+ if (!_film->content().empty()) {
_content_panel->set_selection (_film->content().front ());
}
}
_content_panel->set_selection (_film->content().front ());
}
}
@@
-131,7
+154,15
@@
FilmEditor::set_general_sensitivity (bool s)
}
void
}
void
-FilmEditor::active_jobs_changed (bool a)
+FilmEditor::active_jobs_changed (optional<string> j)
+{
+ set_general_sensitivity (!j);
+}
+
+
+void
+FilmEditor::first_shown ()
{
{
-
set_general_sensitivity (!a
);
+
_content_panel->first_shown (
);
}
}
+