* @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 "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>
using std::string;
using std::list;
using boost::shared_ptr;
+using boost::weak_ptr;
using boost::optional;
-/** @param f Film to edit */
-FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* 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);
+ _main_notebook->AddPage (_content_panel->window(), _("Content"), true);
_dcp_panel = new DCPPanel (_main_notebook, _film);
_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
* @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;
}
- list<string> notes = _film->fix_conflicting_settings ();
- BOOST_FOREACH (string i, notes) {
- message_dialog (this, std_to_wx (i));
- }
-
_content_panel->film_changed (p);
_dcp_panel->film_changed (p);
}
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) {
_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 && _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 ());
}
}
void
FilmEditor::active_jobs_changed (optional<string> j)
{
- set_general_sensitivity (!j || *j == "analyse_audio");
+ set_general_sensitivity (!j);
}