projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add a header with some i18n strings.
[dcpomatic.git]
/
src
/
wx
/
film_editor.cc
diff --git
a/src/wx/film_editor.cc
b/src/wx/film_editor.cc
index 7f9461d940fb4ba6f4035707fc1f930c214c62f9..6d60772be0f2dc805ff88ca565a3114f3f90f602 100644
(file)
--- a/
src/wx/film_editor.cc
+++ b/
src/wx/film_editor.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-201
4
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-201
5
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,61
+17,29
@@
*/
*/
-/** @file src/film_editor.cc
- * @brief
A wx widget to edit a film's metadata, and perform various function
s.
+/** @file src/
wx/
film_editor.cc
+ * @brief
FilmEditor clas
s.
*/
*/
-#include <iostream>
-#include <iomanip>
-#include <wx/wx.h>
-#include <wx/notebook.h>
-#include <wx/listctrl.h>
-#include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/lexical_cast.hpp>
#include "lib/film.h"
#include "lib/film.h"
-#include "lib/transcode_job.h"
-#include "lib/exceptions.h"
#include "lib/job_manager.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.h"
-#include "lib/content_factory.h"
#include "lib/dcp_content.h"
#include "lib/dcp_content.h"
-#include "lib/safe_stringstream.h"
-#include "timecode.h"
#include "wx_util.h"
#include "film_editor.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 "dcp_panel.h"
+#include "content_panel.h"
+#include <wx/wx.h>
+#include <wx/notebook.h>
+#include <iostream>
-using std::string;
using std::cout;
using std::cout;
-using std::pair;
-using std::fixed;
-using std::setprecision;
-using std::list;
-using std::vector;
-using std::max;
+using std::string;
using boost::shared_ptr;
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 */
/** @param f Film to edit */
-FilmEditor::FilmEditor (wxWindow* parent)
+FilmEditor::FilmEditor (wxWindow* parent
, FilmViewer* viewer
)
: wxPanel (parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
: wxPanel (parent)
{
wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@
-79,17
+47,16
@@
FilmEditor::FilmEditor (wxWindow* parent)
_main_notebook = new wxNotebook (this, wxID_ANY);
s->Add (_main_notebook, 1);
_main_notebook = new wxNotebook (this, wxID_ANY);
s->Add (_main_notebook, 1);
- _content_panel = new ContentPanel (_main_notebook, _film);
+ _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);
_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 (
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> ());
-
SetSizerAndFit (s);
}
SetSizerAndFit (s);
}
@@
-102,20
+69,25
@@
void
FilmEditor::film_changed (Film::Property p)
{
ensure_ui_thread ();
FilmEditor::film_changed (Film::Property p)
{
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::CONTENT && !_film->content().empty ()) {
+ /* Select newly-added content */
+ _content_panel->set_selection (_film->content().back ());
+ }
}
void
FilmEditor::film_content_changed (int property)
{
ensure_ui_thread ();
}
void
FilmEditor::film_content_changed (int property)
{
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.
@@
-129,15
+101,15
@@
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);
@@
-166,7
+138,7
@@
FilmEditor::set_general_sensitivity (bool s)
}
void
}
void
-FilmEditor::active_jobs_changed (
bool a
)
+FilmEditor::active_jobs_changed (
optional<string> j
)
{
{
- set_general_sensitivity (!
a
);
+ set_general_sensitivity (!
j || *j == "analyse_audio"
);
}
}