projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tinker with layout.
[dcpomatic.git]
/
src
/
lib
/
dcp_content_type.cc
diff --git
a/src/lib/dcp_content_type.cc
b/src/lib/dcp_content_type.cc
index b3a45e40e410e156d5e4b94ff6032ee2e0011d77..b2455ba21b8f6f316524b976e12116262e44e2f9 100644
(file)
--- a/
src/lib/dcp_content_type.cc
+++ b/
src/lib/dcp_content_type.cc
@@
-1,19
+1,20
@@
/*
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/>.
*/
*/
@@
-21,8
+22,9
@@
* @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
*/
* @brief A description of the type of content for a DCP (e.g. feature, trailer etc.)
*/
-#include <cassert>
#include "dcp_content_type.h"
#include "dcp_content_type.h"
+#include "dcpomatic_assert.h"
+#include <cassert>
#include "i18n.h"
#include "i18n.h"
@@
-33,7
+35,7
@@
vector<DCPContentType const *> DCPContentType::_dcp_content_types;
DCPContentType::DCPContentType (string p, dcp::ContentKind k, string d)
: _pretty_name (p)
, _libdcp_kind (k)
DCPContentType::DCPContentType (string p, dcp::ContentKind k, string d)
: _pretty_name (p)
, _libdcp_kind (k)
- , _
dci
_name (d)
+ , _
isdcf
_name (d)
{
}
{
}
@@
-54,22
+56,10
@@
DCPContentType::setup_dcp_content_types ()
}
DCPContentType const *
}
DCPContentType const *
-DCPContentType::from_pretty_name (string n)
-{
- for (vector<DCPContentType const *>::const_iterator i = _dcp_content_types.begin(); i != _dcp_content_types.end(); ++i) {
- if ((*i)->pretty_name() == n) {
- return *i;
- }
- }
-
- return 0;
-}
-
-DCPContentType const *
-DCPContentType::from_dci_name (string n)
+DCPContentType::from_isdcf_name (string n)
{
for (vector<DCPContentType const *>::const_iterator i = _dcp_content_types.begin(); i != _dcp_content_types.end(); ++i) {
{
for (vector<DCPContentType const *>::const_iterator i = _dcp_content_types.begin(); i != _dcp_content_types.end(); ++i) {
- if ((*i)->
dci
_name() == n) {
+ if ((*i)->
isdcf
_name() == n) {
return *i;
}
}
return *i;
}
}
@@
-80,7
+70,7
@@
DCPContentType::from_dci_name (string n)
DCPContentType const *
DCPContentType::from_index (int n)
{
DCPContentType const *
DCPContentType::from_index (int n)
{
-
assert
(n >= 0 && n < int (_dcp_content_types.size ()));
+
DCPOMATIC_ASSERT
(n >= 0 && n < int (_dcp_content_types.size ()));
return _dcp_content_types[n];
}
return _dcp_content_types[n];
}