Add channel_is_mapped().

diff --git a/src/lib/film_util.cc b/src/lib/film_util.cc
new file mode 100644 (file)
index 0000000..34f48d5
--- /dev/null
+++ b/src/lib/film_util.cc
@@ -0,0 +1,34 @@
+/*
+    Copyright (C) 2023 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include "film.h"
+#include "film_util.h"
+
+
+using std::shared_ptr;
+
+
+bool
+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();
+}

diff --git a/src/lib/film_util.h b/src/lib/film_util.h
new file mode 100644 (file)
index 0000000..f5b91f1
--- /dev/null
+++ b/src/lib/film_util.h
@@ -0,0 +1,28 @@
+/*
+    Copyright (C) 2023 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
+#include <dcp/types.h>
+
+
+class Film;
+
+
+bool channel_is_mapped(std::shared_ptr<const Film> film, dcp::Channel channel);

diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index fc78740bb279a7d26e1bed5a66a2d4076d479d22..e8db82fbb26976424fbbab26ef375a6d7ad1f22c 100644 (file)
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -27,6 +27,7 @@
 #include "dcpomatic_log.h"
 #include "digester.h"
 #include "film.h"
+#include "film_util.h"
 #include "image.h"
 #include "image_png.h"
 #include "job.h"
@@ -192,10 +193,9 @@ ReelWriter::ReelWriter (
 
                DCPOMATIC_ASSERT (film()->directory());
 
-               auto mapped = film()->mapped_audio_channels();
                std::vector<dcp::Channel> extra_active_channels;
-               auto add_if_mapped = [mapped, &extra_active_channels](dcp::Channel channel) {
-                       if (std::find(mapped.begin(), mapped.end(), static_cast<int>(channel)) != mapped.end()) {
+               auto add_if_mapped = [this, &extra_active_channels](dcp::Channel channel) {
+                       if (channel_is_mapped(film(), channel)) {
                                extra_active_channels.push_back(channel);
                        }
                };

diff --git a/src/lib/wscript b/src/lib/wscript
index 00b6b7ed8180943f7ee4f77b6613889aec4088dd..251f09cf70caad267e10bf5f8fde193ac1630cc4 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -115,6 +115,7 @@ sources = """
           ffmpeg_subtitle_stream.cc
           ffmpeg_wrapper.cc
           film.cc
+          film_util.cc
           filter.cc
           font.cc
           font_config.cc