2.0. decklink_consumer: External-key enabled by default.

[casparcg] / common / env.h

diff --git a/common/env.h b/common/env.h
index 25a4e503386df91f18e4583eea5d42da91654be9..bfd8d9907e4c578b7e49bc5f66d5f2163deffa86 100644 (file)
--- a/common/env.h
+++ b/common/env.h
@@ -1,20 +1,38 @@
+/*\r
+* copyright (c) 2010 Sveriges Television AB <info@casparcg.com>\r
+*\r
+*  This file is part of CasparCG.\r
+*\r
+*    CasparCG is free software: you can redistribute it and/or modify\r
+*    it under the terms of the GNU General Public License as published by\r
+*    the Free Software Foundation, either version 3 of the License, or\r
+*    (at your option) any later version.\r
+*\r
+*    CasparCG is distributed in the hope that it will be useful,\r
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
+*    GNU General Public License for more details.\r
+\r
+*    You should have received a copy of the GNU General Public License\r
+*    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.\r
+*\r
+*/\r
 #pragma once\r
 \r
 #include <boost/property_tree/ptree.hpp>\r
 \r
-namespace caspar{\r
+#include <string>\r
+\r
+namespace caspar { namespace env {\r
+\r
+void configure(const std::string& filename);\r
 \r
-struct env\r
-{\r
-       static void initialize(const std::string& filename);\r
-       static const std::wstring& media_folder();\r
-       static const std::wstring& log_folder();\r
-       static const std::wstring& template_folder();\r
-       static const std::wstring& template_host();\r
-       static const std::wstring& data_folder();\r
-       static const std::wstring& version();\r
+const std::wstring& media_folder();\r
+const std::wstring& log_folder();\r
+const std::wstring& template_folder();\r
+const std::wstring& data_folder();\r
+const std::wstring& version();\r
 \r
-       static const boost::property_tree::ptree& properties();\r
-};\r
+const boost::property_tree::ptree& properties();\r
 \r
-};
\ No newline at end of file
+} }
\ No newline at end of file