X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_content_type.cc;h=03c1bf59ff207638f4ce018297ddfe68a7e5f891;hp=e5466e1398936c1e4917efe11e95fa1cf5b12472;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hpb=7979aeb87a83de31c4cf25f88eef4fbca4b56553 diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc index e5466e139..03c1bf59f 100644 --- a/src/lib/dcp_content_type.cc +++ b/src/lib/dcp_content_type.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2012 Carl Hetherington - 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. - 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 - 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 . */ @@ -21,8 +22,9 @@ * @brief A description of the type of content for a DCP (e.g. feature, trailer etc.) */ -#include #include "dcp_content_type.h" +#include "dcpomatic_assert.h" +#include #include "i18n.h" @@ -80,7 +82,7 @@ DCPContentType::from_isdcf_name (string 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]; }