2 files changed, 13 insertions, 19 deletions
diff --git a/src/base/song.cpp b/src/base/song.cpp
index a12a6657..a9a4c2c8 100644
--- a/src/base/song.cpp
+++ b/src/base/song.cpp
@@ -46,11 +46,10 @@ namespace usdx
 		title = get_header_tag("TITLE", true);
 		artist = get_header_tag("ARTIST", true);
 		mp3 = get_header_tag("MP3", true);
-		// TODO
-		// bpm.push_back(new BPM(get_header_tag("BPM", true)));
 
-		// TODO: float
-		// gap = get_header_tag("GAP");
+		bpm.push_back(new BPM(get_header_tag_float("BPM", true)));
+
+		gap = get_header_tag_float("GAP");
 		cover = get_header_tag("COVER");
 		background = get_header_tag("BACKGROUND");
 
@@ -62,28 +61,23 @@ namespace usdx
 		// else
 		//  Log.LogError('Can''t find video file in song: ' +
 	        // Fulfilling);
-
-		// TODO: float
-		// videogap = get_header_tag("VIDEOGAP");
+		video_gap = get_header_tag_float("VIDEOGAP");
 
 		genre = get_header_tag("GENRE");
 		edition = get_header_tag("EDITION");
 		creator = get_header_tag("CREATOR");
 		language = get_header_tag("LANGUAGE");
 
-		// TODO: int
-		// year = get_header_tag("YEAR");
+		year = get_header_tag_int("YEAR");
+
+		start = get_header_tag_float("START");
+		stop = get_header_tag_int("END");
 
-		// TODO: float
-		// start = get_header_tag("START");
+		resolution = get_header_tag_int("RESOLUTION");
+		notes_gap = get_header_tag_int("NOTESGAP");
 
-		// TODO: int
-		// end = get_header_tag("END");
-		// resolution = get_header_tag("RESOLUTION");
-		// notesgap = get_header_tag("NOTESGAP");
+		relative = get_header_tag_bool("RELATIVE");
 
-		// TODO: bool
-		// relative = get_header_tag("RELATIVE");
 
 		// TODO
 		// encoding = get_header_tag("ENCODING");
diff --git a/src/base/song.hpp b/src/base/song.hpp
index 47f2d3a4..e7c36746 100644
--- a/src/base/song.hpp
+++ b/src/base/song.hpp
@@ -60,14 +60,14 @@ namespace usdx
 		std::string genre;
 		std::string edition;
 		std::string language;
-		std::string year;
+		int year;
 		std::string creator;
 
 		int notes_gap;
 		float gap; ///< in miliseconds
 
 		float start; ///< in seconds
-		int finish; ///< in miliseconds
+		int stop; ///< in miliseconds
 		bool relative;
 		int resolution;