diff options
Diffstat (limited to 'src/base/songloading/songloading_strategy_txt.hpp')
-rw-r--r-- | src/base/songloading/songloading_strategy_txt.hpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/base/songloading/songloading_strategy_txt.hpp b/src/base/songloading/songloading_strategy_txt.hpp index 6177a5d3..293c65e6 100644 --- a/src/base/songloading/songloading_strategy_txt.hpp +++ b/src/base/songloading/songloading_strategy_txt.hpp @@ -32,7 +32,7 @@ #include <log4cxx/logger.h> #include "songloading_strategy.hpp" #include "songloading_strategy_factory.hpp" -#include "utils/unicode_file.hpp" +#include "utils/text_file.hpp" namespace usdx { @@ -44,21 +44,21 @@ namespace usdx /** * Split the header field in name and value. */ - std::pair<std::wstring, std::wstring> split_header_field(std::wstring &line); + std::pair<std::string, std::string> split_header_field(std::string &line); - bool parse_line(Song* song, UnicodeFile& file, const int line_number); - void parse_newline(Song* song, std::wistringstream& linestream, const int line_number); - void parse_bpm(Song* song, std::wistringstream& linestream, const int line_number); - void parse_note(Song* song, wchar_t type, std::wistringstream& linestream, const int line_number); + bool parse_line(Song* song, TextFile& file, const int line_number); + void parse_newline(Song* song, std::istringstream& linestream, const int line_number); + void parse_bpm(Song* song, std::istringstream& linestream, const int line_number); + void parse_note(Song* song, char type, std::istringstream& linestream, const int line_number); public: SongloadingStrategyTxt(); virtual ~SongloadingStrategyTxt(); virtual Song* load_song(Song* song); - virtual Song* load_header(const boost::filesystem::wpath& filename); + virtual Song* load_header(const boost::filesystem::path& filename); - static std::wstring get_fileextension(void) { return L".txt"; }; + static std::string get_fileextension(void) { return ".txt"; }; }; REGISTER_SONGLOADING_STRATEGY(SongloadingStrategyTxt); |