#include "lib/transcode_job.h"
#include "lib/dkdm_wrapper.h"
#include "lib/audio_content.h"
-#include "lib/subtitle_content.h"
+#include "lib/check_content_change_job.h"
+#include "lib/text_content.h"
#include <dcp/exceptions.h>
#include <dcp/raw_convert.h>
#include <wx/generic/aboutdlgg.h>
ID_jobs_export,
ID_jobs_send_dcp_to_tms,
ID_jobs_show_dcp,
- ID_tools_video_waveform,
+ ID_jobs_open_dcp_in_player,
+ ID_view_closed_captions,
+ ID_view_video_waveform,
ID_tools_hints,
ID_tools_encoding_servers,
ID_tools_manage_templates,
Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_export, this), ID_jobs_export);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_send_dcp_to_tms, this), ID_jobs_send_dcp_to_tms);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_show_dcp, this), ID_jobs_show_dcp);
- Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_video_waveform, this), ID_tools_video_waveform);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::jobs_open_dcp_in_player, this), ID_jobs_open_dcp_in_player);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_closed_captions, this), ID_view_closed_captions);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::view_video_waveform, this), ID_view_video_waveform);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_hints, this), ID_tools_hints);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_manage_templates, this), ID_tools_manage_templates);
}
set_film (film);
+
+ JobManager::instance()->add(shared_ptr<Job>(new CheckContentChangeJob(film)));
}
catch (std::exception& e) {
wxString p = std_to_wx (file.string ());
_film = film;
_film_viewer->set_film (_film);
_film_editor->set_film (_film);
- delete _video_waveform_dialog;
- _video_waveform_dialog = 0;
+ if (_video_waveform_dialog) {
+ _video_waveform_dialog->Destroy ();
+ _video_waveform_dialog = 0;
+ }
set_menu_sensitivity ();
if (_film->directory()) {
Config::instance()->add_to_history (_film->directory().get());
}
- _film->Changed.connect (boost::bind (&DOMFrame::set_menu_sensitivity, this));
+ _film->Change.connect (boost::bind (&DOMFrame::film_change, this, _1));
}
shared_ptr<Film> film () const {
private:
+ void film_change (ChangeType type)
+ {
+ if (type == CHANGE_TYPE_DONE) {
+ set_menu_sensitivity ();
+ }
+ }
+
void file_changed (boost::filesystem::path f)
{
string s = wx_to_std (_("DCP-o-matic"));
{
DCPOMATIC_ASSERT (_clipboard);
- PasteDialog* d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), static_cast<bool>(_clipboard->subtitle));
+ PasteDialog* d = new PasteDialog (this, static_cast<bool>(_clipboard->video), static_cast<bool>(_clipboard->audio), !_clipboard->text.empty());
if (d->ShowModal() == wxID_OK) {
BOOST_FOREACH (shared_ptr<Content> i, _film_editor->content_panel()->selected()) {
if (d->video() && i->video) {
DCPOMATIC_ASSERT (_clipboard->audio);
i->audio->take_settings_from (_clipboard->audio);
}
- if (d->subtitle() && i->subtitle) {
- DCPOMATIC_ASSERT (_clipboard->subtitle);
- i->subtitle->take_settings_from (_clipboard->subtitle);
+
+ if (d->text()) {
+ list<shared_ptr<TextContent> >::iterator j = i->text.begin ();
+ list<shared_ptr<TextContent> >::const_iterator k = _clipboard->text.begin ();
+ while (j != i->text.end() && k != _clipboard->text.end()) {
+ (*j)->take_settings_from (*k);
+ ++j;
+ ++k;
+ }
}
}
}
}
}
- if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) {
+ if (Config::instance()->show_hints_before_make_dcp()) {
HintsDialog* hints = new HintsDialog (this, _film, false);
int const r = hints->ShowModal();
hints->Destroy ();
return;
}
- if (!get_hints(_film).empty() && Config::instance()->show_hints_before_make_dcp()) {
+ if (Config::instance()->show_hints_before_make_dcp()) {
HintsDialog* hints = new HintsDialog (this, _film, false);
int const r = hints->ShowModal();
hints->Destroy ();
}
}
+ void jobs_open_dcp_in_player ()
+ {
+ if (!_film) {
+ return;
+ }
+
+ if (send_to_other_tool (PLAYER_PLAY_PORT, bind (&start_player, _1), _film->dir(_film->dcp_name(false)).string())) {
+ error_dialog (this, _("Could not find player."));
+ }
+ }
+
void jobs_make_self_dkdm ()
{
if (!_film) {
#endif
}
- void tools_video_waveform ()
+ void view_closed_captions ()
+ {
+ _film_viewer->show_closed_captions ();
+ }
+
+ void view_video_waveform ()
{
if (!_video_waveform_dialog) {
_video_waveform_dialog = new VideoWaveformDialog (this, _film, _film_viewer);
jobs_menu->AppendSeparator ();
add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+ add_item (jobs_menu, _("Open DCP in &player"), ID_jobs_open_dcp_in_player, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
+
+ wxMenu* view = new wxMenu;
+ add_item (view, _("Closed captions..."), ID_view_closed_captions, NEEDS_FILM);
+ add_item (view, _("Video waveform..."), ID_view_video_waveform, NEEDS_FILM);
wxMenu* tools = new wxMenu;
- add_item (tools, _("Video waveform..."), ID_tools_video_waveform, NEEDS_FILM);
add_item (tools, _("Hints..."), ID_tools_hints, 0);
add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0);
add_item (tools, _("Manage templates..."), ID_tools_manage_templates, 0);
m->Append (edit, _("&Edit"));
m->Append (content, _("&Content"));
m->Append (jobs_menu, _("&Jobs"));
+ m->Append (view, _("&View"));
m->Append (tools, _("&Tools"));
m->Append (help, _("&Help"));
}