projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yet more waking (in hash computation).
[dcpomatic.git]
/
src
/
lib
/
dcp_content_type.h
diff --git
a/src/lib/dcp_content_type.h
b/src/lib/dcp_content_type.h
index 14204bd722b6d167e5234e09e88eb331b97362ef..2685e6edfd20b8857060ef1735fae36c74160754 100644
(file)
--- a/
src/lib/dcp_content_type.h
+++ b/
src/lib/dcp_content_type.h
@@
-1,56
+1,56
@@
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ 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.
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.
-
This program
is distributed in the hope that it will be useful,
+
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
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 this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DCPOMATIC_DCP_CONTENT_TYPE_H
#define DCPOMATIC_DCP_CONTENT_TYPE_H
*/
#ifndef DCPOMATIC_DCP_CONTENT_TYPE_H
#define DCPOMATIC_DCP_CONTENT_TYPE_H
-/** @file src/content_type.h
- * @brief
A description of the type of content for a DCP (e.g. feature, trailer etc.)
+/** @file src/
dcp_
content_type.h
+ * @brief
DCPContentType class.
*/
*/
+#include <dcp/dcp.h>
#include <string>
#include <vector>
#include <string>
#include <vector>
-#include <libdcp/dcp.h>
/** @class DCPContentType
* @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
*/
/** @class DCPContentType
* @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
*/
-class DCPContentType
+class DCPContentType
: public boost::noncopyable
{
public:
{
public:
- DCPContentType (std::string,
lib
dcp::ContentKind, std::string);
+ DCPContentType (std::string, dcp::ContentKind, std::string);
/** @return user-visible `pretty' name */
std::string pretty_name () const {
return _pretty_name;
}
/** @return user-visible `pretty' name */
std::string pretty_name () const {
return _pretty_name;
}
-
lib
dcp::ContentKind libdcp_kind () const {
+ dcp::ContentKind libdcp_kind () const {
return _libdcp_kind;
}
return _libdcp_kind;
}
- std::string
dci
_name () const {
- return _
dci
_name;
+ std::string
isdcf
_name () const {
+ return _
isdcf
_name;
}
}
- static DCPContentType const * from_pretty_name (std::string);
- static DCPContentType const * from_dci_name (std::string);
+ static DCPContentType const * from_isdcf_name (std::string);
static DCPContentType const * from_index (int);
static int as_index (DCPContentType const *);
static std::vector<DCPContentType const *> all ();
static DCPContentType const * from_index (int);
static int as_index (DCPContentType const *);
static std::vector<DCPContentType const *> all ();
@@
-58,11
+58,11
@@
public:
private:
std::string _pretty_name;
private:
std::string _pretty_name;
-
lib
dcp::ContentKind _libdcp_kind;
- std::string _
dci
_name;
+ dcp::ContentKind _libdcp_kind;
+ std::string _
isdcf
_name;
/** All available DCP content types */
static std::vector<DCPContentType const *> _dcp_content_types;
};
/** All available DCP content types */
static std::vector<DCPContentType const *> _dcp_content_types;
};
-
+
#endif
#endif