projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add language property to SubtitleContent and use it in output DCP subtitle files.
[dcpomatic.git]
/
src
/
lib
/
player.cc
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index fabb5b21134b00bf2898237f867f5edbbeaa385d..396dc990684667b93060df953cb767f6e6246335 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-50,6
+50,8
@@
#include <stdint.h>
#include <algorithm>
#include <stdint.h>
#include <algorithm>
+#include "i18n.h"
+
#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
using std::list;
#define LOG_GENERAL(...) _film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
using std::list;
@@
-549,6
+551,12
@@
Player::get_subtitles (DCPTime time, DCPTime length, bool starting)
continue;
}
continue;
}
+ /* XXX: this will break down if we have multiple subtitle content */
+ ps.language = subtitle_content->subtitle_language();
+ if (ps.language.empty ()) {
+ ps.language = _("Unknown");
+ }
+
shared_ptr<SubtitleDecoder> subtitle_decoder = dynamic_pointer_cast<SubtitleDecoder> ((*j)->decoder);
ContentTime const from = dcp_to_content_subtitle (*j, time);
/* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */
shared_ptr<SubtitleDecoder> subtitle_decoder = dynamic_pointer_cast<SubtitleDecoder> ((*j)->decoder);
ContentTime const from = dcp_to_content_subtitle (*j, time);
/* XXX: this video_frame_rate() should be the rate that the subtitle content has been prepared for */