aboutsummaryrefslogtreecommitdiffstats
path: root/src/base
diff options
context:
space:
mode:
Diffstat (limited to 'src/base')
-rw-r--r--src/base/song.cpp101
-rw-r--r--src/base/song.hpp20
-rw-r--r--src/base/songloading/songloading_strategy_txt.cpp2
3 files changed, 122 insertions, 1 deletions
diff --git a/src/base/song.cpp b/src/base/song.cpp
index fe93d781..bbaae58b 100644
--- a/src/base/song.cpp
+++ b/src/base/song.cpp
@@ -44,6 +44,7 @@ namespace usdx
title = get_header_tag("TITLE", true);
artist = get_header_tag("ARTIST", true);
mp3 = get_header_tag("MP3", true);
+ // TODO: bpm array
bpm = get_header_tag("BPM", true);
// TODO: float
@@ -112,4 +113,104 @@ namespace usdx
{
return artist;
}
+
+ const std::string& Song::get_mp3(void)
+ {
+ return mp3;
+ }
+
+// TODO: bpm array
+// const bpmarray Song::get_bpm(void)
+// {
+// return bpm;
+// }
+
+// TODO
+// const float Song::get_gap(void)
+// {
+// return gap;
+// }
+
+ const std::string& Song::get_cover(void)
+ {
+ return cover;
+ }
+
+ const std::string& Song::get_background(void)
+ {
+ return background;
+ }
+
+ const std::string& Song::get_video(void)
+ {
+ return video;
+ }
+
+// TODO
+// const float Song::get_videogap(void)
+// {
+// return videogap;
+// }
+
+ const std::string& Song::get_genre(void)
+ {
+ return genre;
+ }
+
+ const std::string& Song::get_edition(void)
+ {
+ return edition;
+ }
+
+ const std::string& Song::get_creator(void)
+ {
+ return creator;
+ }
+
+ const std::string& Song::get_language(void)
+ {
+ return language;
+ }
+
+// TODO
+// const int Song::get_year(void)
+// {
+// return year;
+// }
+
+// TODO
+// const float Song::get_start(void)
+// {
+// return start;
+// }
+
+// TODO
+// const int Song::get_end(void)
+// {
+// return end;
+// }
+
+// TODO
+// const int Song::get_resolution(void)
+// {
+// return resolution;
+// }
+
+// TODO
+// const int Song::get_notesgap(void)
+// {
+// return notesgap;
+// }
+
+// TODO
+// const bool Song::get_relative(void)
+// {
+// return relative;
+// }
+
+// TODO: filetype
+// const std::string& Song::get_encoding(void)
+// {
+// return encoding;
+// }
};
diff --git a/src/base/song.hpp b/src/base/song.hpp
index ae9c3f24..4cdd4c09 100644
--- a/src/base/song.hpp
+++ b/src/base/song.hpp
@@ -83,6 +83,26 @@ namespace usdx
const std::string& get_title(void);
const std::string& get_artist(void);
+ const std::string& get_mp3(void);
+ // TODO: bpm array
+ //const bpmarray get_bpm(void);
+ //const float get_gap(void);
+ const std::string& get_cover(void);
+ const std::string& get_background(void);
+ const std::string& get_video(void);
+ //const float get_videogap(void);
+ const std::string& get_genre(void);
+ const std::string& get_edition(void);
+ const std::string& get_creator(void);
+ const std::string& get_language(void);
+ //const int get_year(void);
+ //const float get_start(void);
+ //const int get_end(void);
+ //const int get_resolution(void);
+ //const int get_notesgap(void);
+ //const bool get_relative(void);
+ // TODO: encodeing class
+ //const std::string& get_encoding(void);
};
};
diff --git a/src/base/songloading/songloading_strategy_txt.cpp b/src/base/songloading/songloading_strategy_txt.cpp
index 31604191..841e6253 100644
--- a/src/base/songloading/songloading_strategy_txt.cpp
+++ b/src/base/songloading/songloading_strategy_txt.cpp
@@ -54,7 +54,7 @@ namespace usdx
std::pair<std::string, std::string> result;
- // copy the substring to : without # to result.first and
+ // copy the substring until ':', without # to result.first and
// transform to upper case
result.first.resize(pos - 1);
std::transform(line.begin() + 1, line.begin() + pos,