4 files changed, 128 insertions, 1 deletions
diff --git a/src/base/config.cpp b/src/base/config.cpp
new file mode 100644
index 00000000..d1824187
--- /dev/null
+++ b/src/base/config.cpp
@@ -0,0 +1,59 @@
+/*
+ * UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program 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,
+ * 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; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include <boost/property_tree/ini_parser.hpp>
+#include "config.hpp"
+
+namespace usdx
+{
+	log4cpp::Category&  Config::log =
+		log4cpp::Category::getInstance("usdx.base.config");
+
+	Config::Config()
+	{
+		try {
+			// TODO: handling different paths
+			read_ini("config.ini", this->pt);
+		}
+		catch(...) {
+			log << log4cpp::Priority::ERROR << "Loading of configuration failed.";
+		}
+	}
+
+	Config::~Config()
+	{
+		this->save();
+	}
+
+	void Config::save(void) const
+	{
+		try {
+			// TODO: handling different paths
+			write_ini("config.ini", this->pt);
+		}
+		catch(...) {
+			log << log4cpp::Priority::ERROR << "Saving of configuration failed.";
+		}
+	}
+};
diff --git a/src/base/config.hpp b/src/base/config.hpp
new file mode 100644
index 00000000..49c2e53a
--- /dev/null
+++ b/src/base/config.hpp
@@ -0,0 +1,53 @@
+/*
+ * UltraStar Deluxe - Karaoke Game
+ *
+ * UltraStar Deluxe is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program 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,
+ * 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; see the file COPYING. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef CONFIG_HPP
+#define CONFIG_HPP
+
+#include <log4cpp/Category.hh>
+#include <boost/property_tree/ptree.hpp>
+
+namespace usdx
+{
+    class Config
+	{
+    private:
+		static log4cpp::Category& log;
+
+		/* This is the property_tree instance holding the configuration
+	     * options.
+		 */
+		boost::property_tree::ptree pt;
+
+	public:
+		Config();
+		virtual ~Config();
+
+		/* Save the current status of the configuration items. */
+		void save(void) const;
+	};
+};
+
+
+#endif
diff --git a/src/menu/application.cpp b/src/menu/application.cpp
index 49581227..45f7af0e 100644
--- a/src/menu/application.cpp
+++ b/src/menu/application.cpp
@@ -38,16 +38,22 @@ namespace usdx
 	Application* Application::instance = NULL;
 
 	Application::Application(Container* parent)
-		: Container(parent), display(NULL), fps_manager(NULL),
+		: Container(parent), config(NULL), display(NULL), fps_manager(NULL),
 		  running(false), frames_per_second(50)
 	{
 		set_size(800, 600);
 		log4cpp::PropertyConfigurator::configure("log4cpp.property");
+		config = new Config();
 		SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO);
 	}
 
 	Application::~Application()
 	{
+		if (config) {
+			delete config;
+			config = NULL;
+		}
+
 		if (fps_manager) {
 			delete fps_manager;
 			fps_manager = NULL;
@@ -68,6 +74,11 @@ namespace usdx
 		return instance;
 	}
 
+	Config* Application::get_config(void)
+	{
+		return get_instance()->config;
+	}
+
 	void Application::main_loop(SDL_Surface* display)
 	{
 		SDL_Event event;
diff --git a/src/menu/application.hpp b/src/menu/application.hpp
index 02508eae..9e6ab5c5 100644
--- a/src/menu/application.hpp
+++ b/src/menu/application.hpp
@@ -32,6 +32,7 @@
 
 #include "container.hpp"
 #include "frame.hpp"
+#include "base/config.hpp"
 
 namespace usdx
 {
@@ -41,6 +42,8 @@ namespace usdx
 		static log4cpp::Category&  log;
 		static Application* instance;
 
+		Config* config;
+
 		SDL_Surface* display;
 		FPSmanager* fps_manager;
 
@@ -62,6 +65,7 @@ namespace usdx
 		virtual ~Application();
 
 		static Application* get_instance(void);
+		static Config* get_config(void);
 
 		void run(void);