#include "content.h"
#include "enum_indexed_vector.h"
#include "font.h"
+#include "resolution.h"
#include <libcxml/cxml.h>
#include <dcp/content_kind.h>
#include <dcp/encrypted_kdm.h>
*/
-#include "types.h"
+
#include "encode_server_description.h"
+#include "resolution.h"
#include <libcxml/cxml.h>
#include <dcp/array_data.h>
+
/** @file src/dcp_video_frame.h
* @brief A single frame of video destined for a DCP.
*/
+
class Log;
class PlayerVideo;
+
/** @class DCPVideo
* @brief A single frame of video destined for a DCP.
*
#include "dcp_text_track.h"
#include "dcpomatic_time.h"
#include "frame_rate_change.h"
+#include "resolution.h"
#include "signaller.h"
#include "transcode_job.h"
-#include "types.h"
+#include "util.h"
#include <dcp/encrypted_kdm.h>
#include <dcp/file.h>
#include <dcp/key.h>
--- /dev/null
+/*
+ Copyright (C) 2013-2019 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 "dcpomatic_assert.h"
+#include "resolution.h"
+
+
+using std::string;
+
+
+/** @param r Resolution.
+ * @return Untranslated string representation.
+ */
+string
+resolution_to_string (Resolution r)
+{
+ switch (r) {
+ case Resolution::TWO_K:
+ return "2K";
+ case Resolution::FOUR_K:
+ return "4K";
+ }
+
+ DCPOMATIC_ASSERT (false);
+ return "";
+}
+
+
+Resolution
+string_to_resolution (string s)
+{
+ if (s == "2K") {
+ return Resolution::TWO_K;
+ }
+
+ if (s == "4K") {
+ return Resolution::FOUR_K;
+ }
+
+ DCPOMATIC_ASSERT (false);
+ return Resolution::TWO_K;
+}
+
+
--- /dev/null
+/*
+ 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_RESOLUTION_H
+#define DCPOMATIC_RESOLUTION_H
+
+
+#include <string>
+
+
+enum class Resolution {
+ TWO_K,
+ FOUR_K
+};
+
+std::string resolution_to_string(Resolution);
+Resolution string_to_resolution(std::string);
+
+
+#endif
using dcp::raw_convert;
-/** @param r Resolution.
- * @return Untranslated string representation.
- */
-string
-resolution_to_string (Resolution r)
-{
- switch (r) {
- case Resolution::TWO_K:
- return "2K";
- case Resolution::FOUR_K:
- return "4K";
- }
-
- DCPOMATIC_ASSERT (false);
- return "";
-}
-
-
-Resolution
-string_to_resolution (string s)
-{
- if (s == "2K") {
- return Resolution::TWO_K;
- }
-
- if (s == "4K") {
- return Resolution::FOUR_K;
- }
-
- DCPOMATIC_ASSERT (false);
- return Resolution::TWO_K;
-}
-
-
TextType
string_to_text_type (string s)
{
time_t last_write_time;
};
-enum class Resolution {
- TWO_K,
- FOUR_K
-};
-
-std::string resolution_to_string (Resolution);
-Resolution string_to_resolution (std::string);
-
enum class FileTransferProtocol {
SCP,
FTP
release_notes.cc
render_text.cc
resampler.cc
+ resolution.cc
rgba.cc
rng.cc
scoped_temporary.cc