[streaming_consumer] Default to pcm_s24le for containers supporting it instead of...

[casparcg] / common / env.h

diff --git a/common/env.h b/common/env.h
index 7b4ee55a9da743dfc0571db930a5aabd7babd460..c7c78ff06872e75b903c8e02c70f68b460384f47 100644 (file)
--- a/common/env.h
+++ b/common/env.h
@@ -1,39 +1,42 @@
-/*\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
-#include <string>\r
-\r
-namespace caspar { namespace env {\r
-\r
-void configure(const std::string& filename);\r
-\r
-const std::wstring& media_folder();\r
-const std::wstring& log_folder();\r
-const std::wstring& template_folder();\r
-const std::wstring& template_host();\r
-const std::wstring& data_folder();\r
-const std::wstring& version();\r
-\r
-const boost::property_tree::ptree& properties();\r
-\r
-} }
\ No newline at end of file
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG 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 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG 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 CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#include <boost/property_tree/ptree_fwd.hpp>
+
+#include <string>
+
+namespace caspar { namespace env {
+
+void configure(const std::wstring& filename);
+
+const std::wstring& media_folder();
+const std::wstring& log_folder();
+const std::wstring& template_folder();
+const std::wstring& data_folder();
+const std::wstring& thumbnails_folder();
+const std::wstring& font_folder();
+const std::wstring& version();
+
+const boost::property_tree::wptree& properties();
+
+} }