X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fuser_property.h;h=fb597eeb64ff67dd74e5b2b67658a017572a228d;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hp=c57cbef3e32d1d30fa9ea21e23cf5286528ea56c;hpb=fa369ef1db0e9f68fdc0145f86ce15446a750af5;p=dcpomatic.git

diff --git a/src/lib/user_property.h b/src/lib/user_property.h
index c57cbef3e..fb597eeb6 100644
--- a/src/lib/user_property.h
+++ b/src/lib/user_property.h
@@ -1,35 +1,54 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 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/>.
 
 */
 
+
+#ifndef DCPOMATIC_USER_PROPERTY_H
+#define DCPOMATIC_USER_PROPERTY_H
+
+
+#include <dcp/locale_convert.h>
+
+
 class UserProperty
 {
 public:
+	enum Category {
+		GENERAL,
+		VIDEO,
+		AUDIO,
+		LENGTH
+	};
+
 	template <class T>
-	UserProperty (std::string category_, std::string key_, T value_, std::string unit_ = "")
+	UserProperty (Category category_, std::string key_, T value_, std::string unit_ = "")
 		: category (category_)
 		, key (key_)
-		, value (raw_convert<std::string> (value_))
+		, value (dcp::locale_convert<std::string> (value_))
 		, unit (unit_)
 	{}
 
-	std::string category;
+	Category category;
 	std::string key;
 	std::string value;
 	std::string unit;
 };
+
+
+#endif