From c1c799117e7076046182e12d71d06e2c9444e9be Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Tue, 8 Nov 2011 10:26:04 +0100
Subject: changed all wstring/wchar_t to string/char

---
 src/base/song.hpp | 60 +++++++++++++++++++++++++++----------------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'src/base/song.hpp')

diff --git a/src/base/song.hpp b/src/base/song.hpp
index d0c06c9a..c5b160af 100644
--- a/src/base/song.hpp
+++ b/src/base/song.hpp
@@ -45,16 +45,16 @@ namespace usdx
 		/**
 		 * TODO: Maybe refactor this to separate sub-classes.
 		 */
-		const std::wstring tag;
+		const std::string tag;
 
 	public:
-		MissingTagException(const std::wstring tag,
+		MissingTagException(const std::string tag,
 				    const std::string message) :
 			BaseException(message), tag(tag) {};
 
 		~MissingTagException () throw () {};
 
-		virtual const std::wstring& get_tag() const { return tag; };
+		virtual const std::string& get_tag() const { return tag; };
 	};
 
 	class Song
@@ -64,25 +64,25 @@ namespace usdx
 
 		boost::filesystem::wpath filename;
 
-		std::wstring title;
-		std::wstring artist;
+		std::string title;
+		std::string artist;
 
 		// filenames
-		std::wstring mp3;
+		std::string mp3;
 
-		std::wstring background;
+		std::string background;
 
-		std::wstring video;
+		std::string video;
 		float video_gap;
 
-		std::wstring cover_file;
+		std::string cover_file;
 		Texture* cover;
 
-		std::wstring genre;
-		std::wstring edition;
-		std::wstring language;
+		std::string genre;
+		std::string edition;
+		std::string language;
 		int year;
-		std::wstring creator;
+		std::string creator;
 
 		int notes_gap;
 		float gap; ///< in miliseconds
@@ -96,12 +96,12 @@ namespace usdx
 
 		std::list<LyricLine*> lyrics;
 
-		std::map<std::wstring, std::wstring> custom_header_tags;
+		std::map<std::string, std::string> custom_header_tags;
 
-		std::wstring get_header_tag(const std::wstring& tag, const bool required = false);
-		float get_header_tag_float(const std::wstring& tag, const bool required = false);
-		int get_header_tag_int(const std::wstring& tag, const bool required = false);
-		bool get_header_tag_bool(const std::wstring& tag, const bool required = false);
+		std::string get_header_tag(const std::string& tag, const bool required = false);
+		float get_header_tag_float(const std::string& tag, const bool required = false);
+		int get_header_tag_int(const std::string& tag, const bool required = false);
+		bool get_header_tag_bool(const std::string& tag, const bool required = false);
 
 		LyricLine* get_last_lyric_line(void);
 		LyricLine* create_new_lyric_line(int start);
@@ -117,25 +117,25 @@ namespace usdx
 		// TODO: Encoding:   TEncoding;
 	public:
 		Song(const boost::filesystem::wpath& filename,
-		     const std::map<std::wstring, std::wstring>& header);
+		     const std::map<std::string, std::string>& header);
 
 		virtual ~Song(void);
 
 		const boost::filesystem::wpath& get_filename(void) const;
 
-		const std::wstring& get_title(void) const;
-		const std::wstring& get_artist(void) const;
-		const std::wstring& get_mp3(void) const;
+		const std::string& get_title(void) const;
+		const std::string& get_artist(void) const;
+		const std::string& get_mp3(void) const;
 		const float get_bpm(int beat) const;
 		const float get_gap(void) const;
-		const std::wstring& get_cover_file(void) const;
-		const std::wstring& get_background(void) const;
-		const std::wstring& get_video(void) const;
+		const std::string& get_cover_file(void) const;
+		const std::string& get_background(void) const;
+		const std::string& get_video(void) const;
 		const float get_video_gap(void) const;
-		const std::wstring& get_genre(void) const;
-		const std::wstring& get_edition(void) const;
-		const std::wstring& get_creator(void) const;
-		const std::wstring& get_language(void) const;
+		const std::string& get_genre(void) const;
+		const std::string& get_edition(void) const;
+		const std::string& get_creator(void) const;
+		const std::string& get_language(void) const;
 		const int get_year(void) const;
 		const float get_start(void) const;
 		const int get_stop(void) const;
@@ -148,7 +148,7 @@ namespace usdx
 
 		void new_bpm(const int beat, const float new_bpm);
 		void new_line(const int line_out, const int line_in);
-		void new_note(const wchar_t type, const int beat, const int length, const int height, const std::wstring& lyric);
+		void new_note(const char type, const int beat, const int length, const int height, const std::string& lyric);
 	};
 };
 
-- 
cgit v1.2.3