Remove st_version.h

The library only cares about file format version. The editor now get the info from application resources. Fixes #3.
pulkomandy · Dec 12, 2020 · a39f70d · a39f70d
1 parent 5572f50
commit a39f70d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/Source/stAboutView.cpp b/Source/stAboutView.cpp
@@ -2,12 +2,14 @@
 Distributed under the terms of the MIT Licence. */
 
 #include <Application.h>
+#include <AppFileInfo.h>
+#include <File.h>
+#include <Roster.h>
 #include <Screen.h>
 #include <Window.h>
 #include <stdio.h>
 
 #include "stAboutView.h"
-#include "st_version.h"
 
 stBmView::stBmView(BRect rect, BBitmap *bm):
 	BView(rect,"name", B_FOLLOW_NONE , B_WILL_DRAW )
@@ -17,12 +19,26 @@ stBmView::stBmView(BRect rect, BBitmap *bm):
 	SetLowColor(0,0,0);
 	SetHighColor(255,255,255);
 
-	sprintf(verstr,"%.1f",(float)ST_CURRENT_EDITOR_VERSION/1000.0);
+	app_info info;
+	be_app->GetAppInfo(&info);
+	BFile file(&info.ref, B_READ_ONLY);
+	BAppFileInfo appMime(&file);
+	version_info versionInfo;
+	if (appMime.GetVersionInfo(&versionInfo, B_APP_VERSION_KIND) == B_OK) {
+		if (versionInfo.major == 0 && versionInfo.middle == 0
+			&& versionInfo.minor == 0) {
+			return;
+		}
+
+		sprintf(verstr,"%" B_PRId32 ".%" B_PRId32 ".%" B_PRId32,
+			versionInfo.major, versionInfo.middle, versionInfo.minor);
+	}
+
 }
 void stBmView::Draw(BRect r)
 {
 	DrawBitmap(m_bm, r, r);
-	DrawString(verstr,	BPoint(1,8));
+	DrawString(verstr,	BPoint(1, 10));
 }
 void stBmView::MouseDown(BPoint)
 {

diff --git a/lib/headers/stSong.h b/lib/headers/stSong.h
@@ -10,8 +10,6 @@ Distributed under the terms of the MIT Licence. */
 #include "ins_part_channel.h"
 #include "txt.h"
 
-#include "st_version.h"
-
 #include "stlimits.h"
 
 // välj vad som skall kompileras

diff --git a/lib/headers/st_version.h b/lib/headers/st_version.h
diff --git a/lib/source/ins_part_channel.cpp b/lib/source/ins_part_channel.cpp
@@ -6,7 +6,6 @@ Distributed under the terms of the MIT Licence. */
 
 #include "ins_part_channel.h"
 #include "txt.h"
-#include "st_version.h"
 #include "stlimits.h"
 
 Ins::Ins(){

diff --git a/lib/source/song.cpp b/lib/source/song.cpp
@@ -11,6 +11,9 @@ Distributed under the terms of the MIT Licence. */
 #include "txt.h"
 #include "player.h"
 
+// Remember to update this if the file format changes!
+#define ST_CURRENT_FILE_VERSION 1200
+
 void *CALLOC(int s1, int s2);
 void *CALLOC(int s1, int s2)
 {