projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Specify python3 for pptex.py
[dcpomatic.git]
/
src
/
wx
/
content_menu.cc
diff --git
a/src/wx/content_menu.cc
b/src/wx/content_menu.cc
index 6e903397d54585b4b49efacb2387cd2e09aa0da2..80976e5f678b80c5f152a33821d0d06fa10320c7 100644
(file)
--- a/
src/wx/content_menu.cc
+++ b/
src/wx/content_menu.cc
@@
-31,6
+31,7
@@
#include "lib/audio_content.h"
#include "lib/config.h"
#include "lib/content_factory.h"
#include "lib/audio_content.h"
#include "lib/config.h"
#include "lib/content_factory.h"
+#include "lib/constants.h"
#include "lib/copy_dcp_details_to_film.h"
#include "lib/dcp_content.h"
#include "lib/dcp_examiner.h"
#include "lib/copy_dcp_details_to_film.h"
#include "lib/dcp_content.h"
#include "lib/dcp_examiner.h"
@@
-474,12
+475,21
@@
ContentMenu::advanced ()
if (content->video) {
content->video->set_use(!dialog->ignore_video());
if (content->video) {
content->video->set_use(!dialog->ignore_video());
+ content->video->set_burnt_subtitle_language(dialog->burnt_subtitle_language());
}
auto ffmpeg = dynamic_pointer_cast<FFmpegContent>(content);
if (ffmpeg) {
ffmpeg->set_filters(dialog->filters());
}
}
auto ffmpeg = dynamic_pointer_cast<FFmpegContent>(content);
if (ffmpeg) {
ffmpeg->set_filters(dialog->filters());
}
+
+ if (dialog->video_frame_rate()) {
+ auto film = _film.lock();
+ DCPOMATIC_ASSERT(film);
+ content->set_video_frame_rate(film, *dialog->video_frame_rate());
+ } else {
+ content->unset_video_frame_rate();
+ }
}
}