bool
-channel_is_mapped(shared_ptr<const Film> film, dcp::Channel channel)
+dcpomatic::film::channel_is_mapped(shared_ptr<const Film> film, dcp::Channel channel)
{
auto const mapped = film->mapped_audio_channels();
return std::find(mapped.begin(), mapped.end(), static_cast<int>(channel)) != mapped.end();
optional<boost::filesystem::path>
-add_files_override_path(shared_ptr<const Film> film)
+dcpomatic::film::add_files_override_path(shared_ptr<const Film> film)
{
film->directory();
return Config::instance()->default_add_file_location() == Config::DefaultAddFileLocation::SAME_AS_PROJECT
class Film;
+namespace dcpomatic
+{
+namespace film
+{
+
+
bool channel_is_mapped(std::shared_ptr<const Film> film, dcp::Channel channel);
boost::optional<boost::filesystem::path> add_files_override_path(std::shared_ptr<const Film> film);
+
+
+}
+}
+
std::vector<dcp::Channel> extra_active_channels;
for (auto channel: std::vector<dcp::Channel>{dcp::Channel::HI, dcp::Channel::VI, dcp::Channel::BSL, dcp::Channel::BSR}) {
- if (channel_is_mapped(film(), channel)) {
+ if (dcpomatic::film::channel_is_mapped(film(), channel)) {
extra_active_channels.push_back(channel);
}
}
}
dcp::MCASoundField field;
- if (channel_is_mapped(film(), dcp::Channel::BSL) || channel_is_mapped(film(), dcp::Channel::BSR)) {
+ if (dcpomatic::film::channel_is_mapped(film(), dcp::Channel::BSL) || dcpomatic::film::channel_is_mapped(film(), dcp::Channel::BSR)) {
field = dcp::MCASoundField::SEVEN_POINT_ONE;
} else {
field = dcp::MCASoundField::FIVE_POINT_ONE;
auto film = _film.lock();
DCPOMATIC_ASSERT(film);
- DirDialog dialog(_parent, _("Select OV"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(film));
+ DirDialog dialog(_parent, _("Select OV"), wxDD_DIR_MUST_EXIST, "AddFilesPath", dcpomatic::film::add_files_override_path(film));
if (dialog.show()) {
dcp->add_ov(dialog.path());
auto film = _film.lock();
DCPOMATIC_ASSERT (film);
- DirDialog dialog(_parent, _("Film to copy settings from"), wxDD_DIR_MUST_EXIST, "CopySettingsPath", add_files_override_path(film));
+ DirDialog dialog(_parent, _("Film to copy settings from"), wxDD_DIR_MUST_EXIST, "CopySettingsPath", dcpomatic::film::add_files_override_path(film));
if (!dialog.show()) {
return;
wxFD_MULTIPLE | wxFD_CHANGE_DIR,
"AddFilesPath",
{},
- add_files_override_path(_film)
+ dcpomatic::film::add_files_override_path(_film)
);
if (dialog.show()) {
void
ContentPanel::add_folder_clicked ()
{
- DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film));
+ DirDialog dialog(_splitter, _("Choose a folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", dcpomatic::film::add_files_override_path(_film));
if (dialog.show()) {
add_folder(dialog.path());
}
void
ContentPanel::add_dcp_clicked ()
{
- DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", add_files_override_path(_film));
+ DirDialog dialog(_splitter, _("Choose a DCP folder"), wxDD_DIR_MUST_EXIST, "AddFilesPath", dcpomatic::film::add_files_override_path(_film));
if (dialog.show()) {
add_dcp(dialog.path());
}