projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Store subtitle language(s) in Film, and allow setup of those
[dcpomatic.git]
/
src
/
lib
/
film.h
diff --git
a/src/lib/film.h
b/src/lib/film.h
index 66bcce80628830db9d977a1c4dcd3b42ecb7da7e..4c71c9e1618efabdf9b7ce95f850d551cb1306e7 100644
(file)
--- a/
src/lib/film.h
+++ b/
src/lib/film.h
@@
-175,9
+175,7
@@
public:
return _state_version;
}
return _state_version;
}
- std::string subtitle_language () const;
-
- std::vector<std::string> audio_output_names () const;
+ std::vector<NamedChannel> audio_output_names () const;
void repeat_content (ContentList, int);
void repeat_content (ContentList, int);
@@
-240,7
+238,8
@@
public:
CHAIN,
DISTRIBUTOR,
FACILITY,
CHAIN,
DISTRIBUTOR,
FACILITY,
- LUMINANCE
+ LUMINANCE,
+ SUBTITLE_LANGUAGES
};
};
@@
-327,8
+326,10
@@
public:
return _reencode_j2k;
}
return _reencode_j2k;
}
+ typedef std::map<dcp::Marker, dcpomatic::DCPTime> Markers;
+
boost::optional<dcpomatic::DCPTime> marker (dcp::Marker type) const;
boost::optional<dcpomatic::DCPTime> marker (dcp::Marker type) const;
-
std::map<dcp::Marker, dcpomatic::DCPTime>
markers () const {
+
Markers
markers () const {
return _markers;
}
return _markers;
}
@@
-376,6
+377,10
@@
public:
return _luminance;
}
return _luminance;
}
+ std::vector<dcp::LanguageTag> subtitle_languages () const {
+ return _subtitle_languages;
+ }
+
/* SET */
void set_directory (boost::filesystem::path);
/* SET */
void set_directory (boost::filesystem::path);
@@
-417,6
+422,11
@@
public:
void set_facility (std::string f);
void set_distributor (std::string d);
void set_luminance (dcp::Luminance l);
void set_facility (std::string f);
void set_distributor (std::string d);
void set_luminance (dcp::Luminance l);
+ void set_subtitle_language (dcp::LanguageTag language);
+ void unset_subtitle_language ();
+ void set_subtitle_languages (std::vector<dcp::LanguageTag> languages);
+
+ void add_ffoc_lfoc (Markers& markers) const;
/** Emitted when some property has of the Film is about to change or has changed */
mutable boost::signals2::signal<void (ChangeType, Property)> Change;
/** Emitted when some property has of the Film is about to change or has changed */
mutable boost::signals2::signal<void (ChangeType, Property)> Change;
@@
-520,6
+530,7
@@
private:
std::string _distributor;
std::string _facility;
dcp::Luminance _luminance;
std::string _distributor;
std::string _facility;
dcp::Luminance _luminance;
+ std::vector<dcp::LanguageTag> _subtitle_languages;
int _state_version;
int _state_version;