Made MIXER CROP work more as one might expect

[casparcg] / common / env.h

diff --git a/common/env.h b/common/env.h
index c0e90c3845d88cfe78945480c503ea71063a4c95..b2c471d1b59e8ed1329f227094115cae314aadcd 100644 (file)
--- a/common/env.h
+++ b/common/env.h
@@ -1,19 +1,41 @@
+/*\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
+*\r
+* This file is part of CasparCG (www.casparcg.com).\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
+* Author: Robert Nagy, ronag89@gmail.com\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::wstring& filename);\r
 \r
-struct env\r
-{\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& data_folder();\r
-       static const std::wstring& version();\r
-       static const std::wstring& version_tag();\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& thumbnails_folder();\r
+const std::wstring& version();\r
 \r
-       static const boost::property_tree::ptree& properties();\r
-};\r
+const boost::property_tree::wptree& properties();\r
 \r
-};
\ No newline at end of file
+} }
\ No newline at end of file