projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extract common code out into kdm_for_screen()
[dcpomatic.git]
/
src
/
wx
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index 1e06bf4a9674f899ff8dfbab55243f836e47a18b..ae0868f27f55f01bf2543e6307efda9639ace184 100644
(file)
--- a/
src/wx/film_editor.cc
+++ b/
src/wx/film_editor.cc
@@
-22,14
+22,14
@@
* @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 <boost/foreach.hpp>
#include <wx/wx.h>
#include <wx/notebook.h>
#include <boost/foreach.hpp>
@@
-39,9
+39,10
@@
using std::cout;
using std::string;
using std::list;
using boost::shared_ptr;
using std::string;
using std::list;
using boost::shared_ptr;
+using boost::weak_ptr;
using boost::optional;
using boost::optional;
-FilmEditor::FilmEditor (wxWindow* parent,
FilmViewer*
viewer)
+FilmEditor::FilmEditor (wxWindow* parent,
weak_ptr<FilmViewer>
viewer)
: wxPanel (parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
: wxPanel (parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@
-50,8
+51,8
@@
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);
JobManager::instance()->ActiveJobsChanged.connect (
_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
JobManager::instance()->ActiveJobsChanged.connect (
@@
-124,18
+125,21
@@
FilmEditor::set_film (shared_ptr<Film> film)
_content_panel->set_film (_film);
_dcp_panel->set_film (_film);
_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 ("");
}
FileChanged (_film->directory().get());
} else {
FileChanged ("");
}
- if (!_film->content().empty
()) {
+ if (!_film->content().empty()) {
_content_panel->set_selection (_film->content().front ());
}
}
_content_panel->set_selection (_film->content().front ());
}
}