Extract named_channel.h

diff --git a/src/lib/audio_content.h b/src/lib/audio_content.h
index bd5a25b98ccd4bd102b41b5a5fb571a3fd2a3b6e..18f826ee6dbe9751f9a3d96efbbdd7373a20326a 100644 (file)
--- a/src/lib/audio_content.h
+++ b/src/lib/audio_content.h
@@ -28,9 +28,10 @@
 #define DCPOMATIC_AUDIO_CONTENT_H
 
 
-#include "content_part.h"
-#include "audio_stream.h"
 #include "audio_mapping.h"
+#include "audio_stream.h"
+#include "content_part.h"
+#include "named_channel.h"
 
 
 /** @class AudioContentProperty

diff --git a/src/lib/audio_processor.h b/src/lib/audio_processor.h
index e24506acdf4dd287d659542e5c6dbac9e0840bcc..4cfda1defb5d84800594fc13717a985c26abc917 100644 (file)
--- a/src/lib/audio_processor.h
+++ b/src/lib/audio_processor.h
@@ -28,7 +28,7 @@
 #define DCPOMATIC_AUDIO_PROCESSOR_H
 
 
-#include "types.h"
+#include "named_channel.h"
 #include <memory>
 #include <string>
 #include <vector>

diff --git a/src/lib/film.h b/src/lib/film.h
index 55412c2e88b03936ef35e297b7f77699adebb55e..f3e05f083f5690944dac5e1caa922e4cfc128cfb 100644 (file)
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -33,6 +33,7 @@
 #include "dcp_text_track.h"
 #include "dcpomatic_time.h"
 #include "frame_rate_change.h"
+#include "named_channel.h"
 #include "resolution.h"
 #include "signaller.h"
 #include "transcode_job.h"

diff --git a/src/lib/named_channel.cc b/src/lib/named_channel.cc
new file mode 100644 (file)
index 0000000..f352b21
--- /dev/null
+++ b/src/lib/named_channel.cc
@@ -0,0 +1,30 @@
+/*
+    Copyright (C) 2013-2021 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 "named_channel.h"
+
+
+bool operator== (NamedChannel const& a, NamedChannel const& b)
+{
+       return a.name == b.name && a.index == b.index;
+}
+
+

diff --git a/src/lib/named_channel.h b/src/lib/named_channel.h
new file mode 100644 (file)
index 0000000..f6a3fcf
--- /dev/null
+++ b/src/lib/named_channel.h
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2013-2021 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/>.
+
+*/
+
+
+#ifndef DCPOMATIC_NAMED_CHANNEL_H
+#define DCPOMATIC_NAMED_CHANNEL_H
+
+
+#include <string>
+
+
+class NamedChannel
+{
+public:
+       NamedChannel (std::string name_, int index_)
+               : name(name_)
+               , index(index_)
+       {}
+
+       std::string name;
+       int index;
+};
+
+
+bool operator== (NamedChannel const& a, NamedChannel const& b);
+
+
+#endif
+

diff --git a/src/lib/types.cc b/src/lib/types.cc
index d9108a94219dcb82aef96d66aa03e4a8f6a16fdb..69d27a1ce2776bea1bbabf9ea592fedcfd78becb 100644 (file)
--- a/src/lib/types.cc
+++ b/src/lib/types.cc
@@ -167,12 +167,6 @@ CPLSummary::CPLSummary (boost::filesystem::path p)
 }
 
 
-bool operator== (NamedChannel const& a, NamedChannel const& b)
-{
-       return a.name == b.name && a.index == b.index;
-}
-
-
 string
 video_range_to_string (VideoRange r)
 {

diff --git a/src/lib/types.h b/src/lib/types.h
index ad9158c8c232914c5cdf07752c1d57d96973b45c..9bf4c80b1b732560d133114f932ab2ff27344731 100644 (file)
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -199,19 +199,4 @@ enum class EmailProtocol {
 };
 
 
-class NamedChannel
-{
-public:
-       NamedChannel (std::string name_, int index_)
-               : name(name_)
-               , index(index_)
-       {}
-
-       std::string name;
-       int index;
-};
-
-
-bool operator== (NamedChannel const& a, NamedChannel const& b);
-
 #endif

diff --git a/src/lib/wscript b/src/lib/wscript
index 447c0f4783d832de4b80e7bd9fbd677d1012ea62..f3e16fad871a6819e1c469872a0bcb7af5429379 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -146,6 +146,7 @@ sources = """
           maths_util.cc
           memory_util.cc
           mid_side_decoder.cc
+          named_channel.cc
           overlaps.cc
           pixel_quanta.cc
           player.cc

diff --git a/src/wx/audio_mapping_view.h b/src/wx/audio_mapping_view.h
index 873fc5c93800fd74d5e761165fdbd712ecb49b9f..3bdc8f1a99154c9d7a10b6217de35572906bdeef 100644 (file)
--- a/src/wx/audio_mapping_view.h
+++ b/src/wx/audio_mapping_view.h
@@ -25,6 +25,7 @@
 
 
 #include "lib/audio_mapping.h"
+#include "lib/named_channel.h"
 #include "lib/types.h"
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS