Put film_util methods in a namespace.

6 files changed, 20 insertions, 9 deletions

diff --git a/src/lib/film_util.cc b/src/lib/film_util.cc
index a12a3ae89..e5bc30db4 100644
--- a/src/lib/film_util.cc
+++ b/src/lib/film_util.cc
@@ -29,7 +29,7 @@ using boost::optional;
 
 
 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();
@@ -37,7 +37,7 @@ channel_is_mapped(shared_ptr<const Film> film, dcp::Channel channel)
 
 
 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
diff --git a/src/lib/film_util.h b/src/lib/film_util.h
index 3e5f40644..958c2c3cc 100644
--- a/src/lib/film_util.h
+++ b/src/lib/film_util.h
@@ -25,5 +25,16 @@
 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);
+
+
+}
+}
+
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 3cd889249..7bcc2d796 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -226,7 +226,7 @@ ReelWriter::ReelWriter (
 
 		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);
 			}
 		}
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 9b7f059f9..3f5be531e 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -671,7 +671,7 @@ Writer::finish()
 	}
 
 	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;
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index 30abe7416..cd2b8c914 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -460,7 +460,7 @@ ContentMenu::ov ()
 
 	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());
@@ -617,7 +617,7 @@ ContentMenu::copy_settings()
 	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;
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 7d329aaed..8938ef0fd 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -621,7 +621,7 @@ ContentPanel::add_file_clicked ()
 		wxFD_MULTIPLE | wxFD_CHANGE_DIR,
 		"AddFilesPath",
 		{},
-		add_files_override_path(_film)
+		dcpomatic::film::add_files_override_path(_film)
 		);
 
 	if (dialog.show()) {
@@ -633,7 +633,7 @@ ContentPanel::add_file_clicked ()
 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());
 	}
@@ -676,7 +676,7 @@ ContentPanel::add_folder(boost::filesystem::path folder)
 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());
 	}