summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-02-06 11:51:24 +0100
committerCarl Hetherington <cth@carlh.net>2024-04-18 12:11:43 +0200
commit6801a43a489b3e55ab062b0db46e0e03d20e9bcb (patch)
treef46d8a54dc00852d015d59c7b7a37e1654381dae /src
parentc7de16512dad5f4a1e9c1acdaddfc300e428ed3e (diff)
Move Behaviour enum out of J2KPictureAsset.
Diffstat (limited to 'src')
-rw-r--r--src/behaviour.h52
-rw-r--r--src/j2k_picture_asset.h6
-rw-r--r--src/wscript1
3 files changed, 54 insertions, 5 deletions
diff --git a/src/behaviour.h b/src/behaviour.h
new file mode 100644
index 00000000..1600966c
--- /dev/null
+++ b/src/behaviour.h
@@ -0,0 +1,52 @@
+/*
+ Copyright (C) 2024 Carl Hetherington <cth@carlh.net>
+
+ This file is part of libdcp.
+
+ libdcp 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.
+
+ libdcp 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 libdcp. If not, see <http://www.gnu.org/licenses/>.
+
+ In addition, as a special exception, the copyright holders give
+ permission to link the code of portions of this program with the
+ OpenSSL library under certain conditions as described in each
+ individual source file, and distribute linked combinations
+ including the two.
+
+ You must obey the GNU General Public License in all respects
+ for all of the code used other than OpenSSL. If you modify
+ file(s) with this exception, you may extend this exception to your
+ version of the file(s), but you are not obligated to do so. If you
+ do not wish to do so, delete this exception statement from your
+ version. If you delete this exception statement from all source
+ files in the program, then also delete it here.
+*/
+
+
+#ifndef LIBDCP_BEHAVIOUR_H
+#define LIBDCP_BEHAVIOUR_H
+
+
+namespace dcp {
+
+
+enum class Behaviour {
+ OVERWRITE_EXISTING,
+ MAKE_NEW
+};
+
+
+}
+
+
+#endif
+
diff --git a/src/j2k_picture_asset.h b/src/j2k_picture_asset.h
index 7ebfed10..972de43e 100644
--- a/src/j2k_picture_asset.h
+++ b/src/j2k_picture_asset.h
@@ -41,6 +41,7 @@
#define LIBDCP_J2K_PICTURE_ASSET_H
+#include "behaviour.h"
#include "mxf.h"
#include "metadata.h"
#include "picture_asset.h"
@@ -74,11 +75,6 @@ public:
/** Create a new J2KPictureAsset with a given edit rate and standard */
J2KPictureAsset (Fraction edit_rate, Standard standard);
- enum class Behaviour {
- OVERWRITE_EXISTING,
- MAKE_NEW
- };
-
virtual std::shared_ptr<J2KPictureAssetWriter> start_write (
boost::filesystem::path file,
Behaviour behaviour
diff --git a/src/wscript b/src/wscript
index ba063298..0a26bf30 100644
--- a/src/wscript
+++ b/src/wscript
@@ -141,6 +141,7 @@ def build(bld):
atmos_asset_reader.h
atmos_asset_writer.h
atmos_frame.h
+ behaviour.h
certificate.h
certificate_chain.h
chromaticity.h