diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-01-17 20:18:29 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2013-01-05 17:17:44 +0100 |
| commit | 5009375468b780cfeb0aac7e28425699991c621b (patch) | |
| tree | d3a5e5f1298859ea0940772e56aa2c1e9f33cb79 /src/base/songloading | |
| parent | 4949504dfaa79e32b9dc24c2937fdad63c8fcff5 (diff) | |
| download | usdx-5009375468b780cfeb0aac7e28425699991c621b.tar.gz usdx-5009375468b780cfeb0aac7e28425699991c621b.tar.xz usdx-5009375468b780cfeb0aac7e28425699991c621b.zip | |
added complete song structure
added LyricLines for lines of lyrics with some words
added LyricWords for single words (notes) of lyrics
added construction/deconstruction of lines and words form parsed data
changed BPM list to list of pointer
Diffstat (limited to 'src/base/songloading')
| -rw-r--r-- | src/base/songloading/songloading_strategy_txt.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/base/songloading/songloading_strategy_txt.cpp b/src/base/songloading/songloading_strategy_txt.cpp index 5f2017a6..1a2c8eaf 100644 --- a/src/base/songloading/songloading_strategy_txt.cpp +++ b/src/base/songloading/songloading_strategy_txt.cpp @@ -171,7 +171,7 @@ namespace usdx << line_out); } - // song.new_line(line_out, line_in); + song->new_line(line_out, line_in); } void SongloadingStrategyTxt::parse_bpm(Song *song, std::istringstream& linestream, const int line_number) @@ -184,7 +184,7 @@ namespace usdx LOG4CXX_DEBUG(log, "Found new bpm in line " << line_number << " starting at beat: " << beat << " and new bpm of " << new_bpm.get_value()); - // song.new_bpm(new_beat, new_bpm); + song->new_bpm(beat, new_bpm.get_value()); } void SongloadingStrategyTxt::parse_note(Song *song, char type, std::istringstream& linestream, const int line_number) @@ -200,7 +200,7 @@ namespace usdx LOG4CXX_DEBUG(log, "Found lyric: '" << lyric << "' at line: " << line_number << " at beat: " << beat << " with length: " << length << " at height: " << height); - // song.new_note(beat, length, height, lyric); + song->new_note(type, beat, length, height, lyric); } Song* SongloadingStrategyTxt::load_header(const std::string& filename) |