diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-07-19 22:44:53 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-07-19 23:45:23 +0100 |
| commit | 27b83475435dda4e84a90cf59a52f150905c4ab1 (patch) | |
| tree | 51d0158c7a879f6b2f3c40843c5e5e455069a1dc /src/tools | |
| parent | 9cb73fbc0fa4643612f01665bc6d9fc430656f32 (diff) | |
Clean up after previous commit.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 10 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 934e57505..9262be1b5 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -71,7 +71,7 @@ #include "lib/transcode_job.h" #include "lib/dkdm_wrapper.h" #include "lib/audio_content.h" -#include "lib/text_content.h" +#include "lib/caption_content.h" #include <dcp/exceptions.h> #include <dcp/raw_convert.h> #include <wx/generic/aboutdlgg.h> @@ -563,7 +563,7 @@ private: { 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), static_cast<bool>(_clipboard->caption)); if (d->ShowModal() == wxID_OK) { BOOST_FOREACH (shared_ptr<Content> i, _film_editor->content_panel()->selected()) { if (d->video() && i->video) { @@ -574,9 +574,9 @@ private: 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->caption() && i->caption) { + DCPOMATIC_ASSERT (_clipboard->caption); + i->caption->take_settings_from (_clipboard->caption); } } } diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 3f56f4752..0af44fd05 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -27,7 +27,7 @@ #include "lib/job_manager.h" #include "lib/job.h" #include "lib/video_content.h" -#include "lib/text_content.h" +#include "lib/caption_content.h" #include "lib/ratio.h" #include "lib/verify_dcp_job.h" #include "lib/dcp_examiner.h" @@ -618,8 +618,8 @@ private: void setup_from_dcp (shared_ptr<DCPContent> dcp) { - if (dcp->subtitle) { - dcp->subtitle->set_use (true); + if (dcp->caption) { + dcp->caption->set_use (true); } if (dcp->video) { |