Put film_util methods in a namespace.
authorCarl Hetherington <cth@carlh.net>
Tue, 14 Jan 2025 09:39:12 +0000 (10:39 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 14 Jan 2025 22:51:12 +0000 (23:51 +0100)
src/lib/film_util.cc
src/lib/film_util.h
src/lib/reel_writer.cc
src/lib/writer.cc
src/wx/content_menu.cc
src/wx/content_panel.cc

index a12a3ae897973217c10ef35053cf20cef79aa6f8..e5bc30db48d65b429e65eac9b5f64716db30628a 100644 (file)
@@ -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
index 3e5f406446caadd374f224e6599e85ac7a04c62a..958c2c3cc8ca405ef39f33d832ec9cf42ff60dec 100644 (file)
 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);
+
+
+}
+}
+
index 3cd889249e646a6680524a5a55444e01712f88ad..7bcc2d796299ba34dd05077bd5376b44f6066417 100644 (file)
@@ -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);
                        }
                }
index 9b7f059f9feaf6f278a5f1a82bdbd25c3a8093fc..3f5be531ef0eda2c66450302d58ea4c26619cd96 100644 (file)
@@ -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;
index 30abe7416cd859f91a71e2ee61e2676219c5f6ee..cd2b8c914dfb1f958f1419e8fe3c7919a007ff30 100644 (file)
@@ -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;
index 7d329aaed29c70c3de955f5bb101f0110b5dae42..8938ef0fd0930bdd31ba385ae2e0b4893476c999 100644 (file)
@@ -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());
        }