Another macOS std::list boost::thread SNAFU.

[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..613ed15a5b002622017dc0b13151ed972a92b1bf 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>
 
-    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 <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.)
  */
 
-#include <cassert>
 #include "dcp_content_type.h"
+#include "dcpomatic_assert.h"
+#include <cassert>
 
 #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)
-       , _dci_name (d)
+       , _isdcf_name (d)
 {
 
 }
@@ -51,25 +53,15 @@ DCPContentType::setup_dcp_content_types ()
        _dcp_content_types.push_back (new DCPContentType (_("Policy"), dcp::POLICY, N_("POL")));
        _dcp_content_types.push_back (new DCPContentType (_("Public Service Announcement"), dcp::PUBLIC_SERVICE_ANNOUNCEMENT, N_("PSA")));
        _dcp_content_types.push_back (new DCPContentType (_("Advertisement"), dcp::ADVERTISEMENT, N_("ADV")));
+       _dcp_content_types.push_back (new DCPContentType (_("Episode"), dcp::EPISODE, N_("EPS")));
+       _dcp_content_types.push_back (new DCPContentType (_("Promo"), dcp::PROMO, N_("PRO")));
 }
 
 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) {
-               if ((*i)->dci_name() == n) {
+               if ((*i)->isdcf_name() == n) {
                        return *i;
                }
        }
@@ -80,7 +72,7 @@ DCPContentType::from_dci_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];
 }