projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Be more careful about allowing possibly-trouble-causing characters in DCP filenames.
[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 ebfe09518a5577189e745d05d0a37bfd6d1ce04c..2685e6edfd20b8857060ef1735fae36c74160754 100644
(file)
--- a/
src/lib/dcp_content_type.h
+++ b/
src/lib/dcp_content_type.h
@@
-1,32
+1,33
@@
/*
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 <dcp/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.)
@@
-49,7
+50,6
@@
public:
return _isdcf_name;
}
return _isdcf_name;
}
- static DCPContentType const * from_pretty_name (std::string);
static DCPContentType const * from_isdcf_name (std::string);
static DCPContentType const * from_index (int);
static int as_index (DCPContentType const *);
static DCPContentType const * from_isdcf_name (std::string);
static DCPContentType const * from_index (int);
static int as_index (DCPContentType const *);
@@
-64,5
+64,5
@@
private:
/** 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