diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2011-11-08 10:26:04 +0100 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:49 +0100 |
commit | c1c799117e7076046182e12d71d06e2c9444e9be (patch) | |
tree | 7940de26d0c786134fa103703320bd3efcbba00c /src/base/song.cpp | |
parent | 31ba94d4efa6e3f64ffacf1711438e88d8b3035d (diff) | |
download | usdx-c1c799117e7076046182e12d71d06e2c9444e9be.tar.gz usdx-c1c799117e7076046182e12d71d06e2c9444e9be.tar.xz usdx-c1c799117e7076046182e12d71d06e2c9444e9be.zip |
changed all wstring/wchar_t to string/char
Diffstat (limited to '')
-rw-r--r-- | src/base/song.cpp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/src/base/song.cpp b/src/base/song.cpp index 9b0cbf12..209f13de 100644 --- a/src/base/song.cpp +++ b/src/base/song.cpp @@ -39,38 +39,38 @@ namespace usdx } Song::Song(const boost::filesystem::wpath& filename, - const std::map<std::wstring, std::wstring>& header) : + const std::map<std::string, std::string>& header) : filename(filename), custom_header_tags(header) { - std::map<std::wstring, std::wstring>::iterator it; + std::map<std::string, std::string>::iterator it; - title = get_header_tag(L"TITLE", true); - artist = get_header_tag(L"ARTIST", true); - mp3 = get_header_tag(L"MP3", true); + title = get_header_tag("TITLE", true); + artist = get_header_tag("ARTIST", true); + mp3 = get_header_tag("MP3", true); - bpm.push_back(new BPM(get_header_tag_float(L"BPM", true))); + bpm.push_back(new BPM(get_header_tag_float("BPM", true))); - gap = get_header_tag_float(L"GAP"); - cover_file = get_header_tag(L"COVER"); - background = get_header_tag(L"BACKGROUND"); + gap = get_header_tag_float("GAP"); + cover_file = get_header_tag("COVER"); + background = get_header_tag("BACKGROUND"); - video = get_header_tag(L"VIDEO"); - video_gap = get_header_tag_float(L"VIDEOGAP"); + video = get_header_tag("VIDEO"); + video_gap = get_header_tag_float("VIDEOGAP"); - genre = get_header_tag(L"GENRE"); - edition = get_header_tag(L"EDITION"); - creator = get_header_tag(L"CREATOR"); - language = get_header_tag(L"LANGUAGE"); + genre = get_header_tag("GENRE"); + edition = get_header_tag("EDITION"); + creator = get_header_tag("CREATOR"); + language = get_header_tag("LANGUAGE"); - year = get_header_tag_int(L"YEAR"); + year = get_header_tag_int("YEAR"); - start = get_header_tag_float(L"START"); - stop = get_header_tag_int(L"END"); + start = get_header_tag_float("START"); + stop = get_header_tag_int("END"); - resolution = get_header_tag_int(L"RESOLUTION"); - notes_gap = get_header_tag_int(L"NOTESGAP"); + resolution = get_header_tag_int("RESOLUTION"); + notes_gap = get_header_tag_int("NOTESGAP"); - relative = get_header_tag_bool(L"RELATIVE"); + relative = get_header_tag_bool("RELATIVE"); // TODO // EncFile := DecodeFilename(Value); @@ -98,27 +98,27 @@ namespace usdx lyrics.clear(); } - std::wstring Song::get_header_tag(const std::wstring& tag, const bool required) + std::string Song::get_header_tag(const std::string& tag, const bool required) { - std::map<std::wstring, std::wstring>::iterator it; - std::wstring result = L""; + std::map<std::string, std::string>::iterator it; + std::string result = ""; if ((it = custom_header_tags.find(tag)) != custom_header_tags.end()) { result = it->second; custom_header_tags.erase(it); } else if (required) { - LOG4CXX_ERROR(log, L"Incomplete Song! Missing '" << tag << L"' Tag in: '" << - get_filename() << L"'"); + LOG4CXX_ERROR(log, "Incomplete Song! Missing '" << tag << "' Tag in: '" << + get_filename() << "'"); throw MissingTagException(tag, "Incomplete Song! Missing Tag."); } return result; } - float Song::get_header_tag_float(const std::wstring& tag, const bool required) + float Song::get_header_tag_float(const std::string& tag, const bool required) { - std::map<std::wstring, std::wstring>::iterator it; + std::map<std::string, std::string>::iterator it; float result; if ((it = custom_header_tags.find(tag)) != custom_header_tags.end()) { @@ -126,49 +126,49 @@ namespace usdx custom_header_tags.erase(it); } else if (required) { - LOG4CXX_ERROR(log, L"Incomplete Song! Missing '" << tag << L"' Tag in: '" << - get_filename() << L"'"); + LOG4CXX_ERROR(log, "Incomplete Song! Missing '" << tag << "' Tag in: '" << + get_filename() << "'"); throw MissingTagException(tag, "Incomplete Song! Missing Tag."); } return result; } - int Song::get_header_tag_int(const std::wstring& tag, const bool required) + int Song::get_header_tag_int(const std::string& tag, const bool required) { - std::map<std::wstring, std::wstring>::iterator it; + std::map<std::string, std::string>::iterator it; int result; if ((it = custom_header_tags.find(tag)) != custom_header_tags.end()) { - std::wistringstream stream(it->second); + std::istringstream stream(it->second); custom_header_tags.erase(it); stream >> result; } else if (required) { - LOG4CXX_ERROR(log, L"Incomplete Song! Missing '" << tag << L"' Tag in: '" << - get_filename() << L"'"); + LOG4CXX_ERROR(log, "Incomplete Song! Missing '" << tag << "' Tag in: '" << + get_filename() << "'"); throw MissingTagException(tag, "Incomplete Song! Missing Tag."); } return result; } - bool Song::get_header_tag_bool(const std::wstring& tag, const bool required) + bool Song::get_header_tag_bool(const std::string& tag, const bool required) { - std::map<std::wstring, std::wstring>::iterator it; + std::map<std::string, std::string>::iterator it; bool result; if ((it = custom_header_tags.find(tag)) != custom_header_tags.end()) { // accept all like (YES, JA, TRUE, 1) - result = (it->second[0] == L'j' || it->second[0] == L'J' || - it->second[0] == L'y' || it->second[0] == L'Y' || - it->second[0] == L't' || it->second[0] == L'T' || - it->second[0] == L'1'); + result = (it->second[0] == 'j' || it->second[0] == 'J' || + it->second[0] == 'y' || it->second[0] == 'Y' || + it->second[0] == 't' || it->second[0] == 'T' || + it->second[0] == '1'); custom_header_tags.erase(it); } else if (required) { - LOG4CXX_ERROR(log, L"Incomplete Song! Missing '" << tag << L"' Tag in: '" << - get_filename() << L"'"); + LOG4CXX_ERROR(log, "Incomplete Song! Missing '" << tag << "' Tag in: '" << + get_filename() << "'"); throw MissingTagException(tag, "Incomplete Song! Missing Tag."); } @@ -191,17 +191,17 @@ namespace usdx return line; } - const std::wstring& Song::get_title(void) const + const std::string& Song::get_title(void) const { return title; } - const std::wstring& Song::get_artist(void) const + const std::string& Song::get_artist(void) const { return artist; } - const std::wstring& Song::get_mp3(void) const + const std::string& Song::get_mp3(void) const { return mp3; } @@ -226,17 +226,17 @@ namespace usdx return gap; } - const std::wstring& Song::get_cover_file(void) const + const std::string& Song::get_cover_file(void) const { return cover_file; } - const std::wstring& Song::get_background(void) const + const std::string& Song::get_background(void) const { return background; } - const std::wstring& Song::get_video(void) const + const std::string& Song::get_video(void) const { return video; } @@ -246,22 +246,22 @@ namespace usdx return video_gap; } - const std::wstring& Song::get_genre(void) const + const std::string& Song::get_genre(void) const { return genre; } - const std::wstring& Song::get_edition(void) const + const std::string& Song::get_edition(void) const { return edition; } - const std::wstring& Song::get_creator(void) const + const std::string& Song::get_creator(void) const { return creator; } - const std::wstring& Song::get_language(void) const + const std::string& Song::get_language(void) const { return language; } @@ -321,7 +321,7 @@ namespace usdx create_new_lyric_line(line_in + get_relative_beat()); } - void Song::new_note(const wchar_t type, const int beat, const int length, const int height, const std::wstring& lyric) + void Song::new_note(const char type, const int beat, const int length, const int height, const std::string& lyric) { get_last_lyric_line()->add_word(new LyricWord(type, beat + get_relative_beat(), length, height, lyric)); } |