Merge branch '0.55.3'

etternagame · Oct 12, 2017 · 9ac2612 · 9ac2612
2 parents cb508d0 + 6ed156e
commit 9ac2612
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/CMake/SMDefs.cmake b/CMake/SMDefs.cmake
@@ -1,7 +1,7 @@
 # Set up version numbers according to the new scheme.
 set(SM_VERSION_MAJOR 0)
 set(SM_VERSION_MINOR 55)
-set(SM_VERSION_PATCH 2)
+set(SM_VERSION_PATCH 3)
 set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
 
 execute_process(COMMAND git rev-parse --short HEAD

diff --git a/src/AdjustSync.cpp b/src/AdjustSync.cpp
@@ -107,6 +107,7 @@ void AdjustSync::SaveSyncChanges()
 		else
 		{
 			GAMESTATE->m_pCurSong->Save();
+			GAMESTATE->m_pCurSong->ReloadFromSongDir();
 		}
 	}
 	if( s_fGlobalOffsetSecondsOriginal != PREFSMAN->m_fGlobalOffsetSeconds )

diff --git a/src/GameState.h b/src/GameState.h
@@ -213,7 +213,7 @@ class GameState
 	bool		m_bLoadingNextSong;
 	int		GetLoadingCourseSongIndex() const;
 
-	RString GetEtternaVersion() { return "0.55.2"; }
+	RString GetEtternaVersion() { return "0.55.3"; }
 	bool isplaylistcourse = false;
 	bool IsPlaylistCourse() { return isplaylistcourse; }
 	bool CountNotesSeparately();

diff --git a/src/ProductInfo.inc b/src/ProductInfo.inc
@@ -6,7 +6,7 @@
 
 !define PRODUCT_ID "Etterna"
 ; TODO: This needs to be updated with the git rev hash
-!define PRODUCT_VER "v0.55.2"
+!define PRODUCT_VER "v0.55.3"
 !define PRODUCT_DISPLAY "${PRODUCT_FAMILY} ${PRODUCT_VER}"
 !define PRODUCT_BITMAP "ett"
 

diff --git a/src/RageSoundReader_MP3.cpp b/src/RageSoundReader_MP3.cpp
@@ -322,7 +322,7 @@ int RageSoundReader_MP3::WriteSamplesForAllChannels(void *pBuf, int samplesToRea
 
 int RageSoundReader_MP3::GetNextSourceFrame() const
 {
-	return curFrame;
+	return curFrame + codecCtx->frame_size;
 }
 
 // Return: -1 => Error already set. -2 => EOF. >=0 => bytesRead

diff --git a/stepmania.nsi b/stepmania.nsi
@@ -43,7 +43,7 @@
 
 	; don't forget to change this before releasing a new version.
 	; wish this could be automated, but it requires "X.Y.Z.a" format. -aj
-	VIProductVersion "0.55.2.0"
+	VIProductVersion "0.55.3.0"
 	VIAddVersionKey "ProductName" "${PRODUCT_ID}"
 	VIAddVersionKey "FileVersion" "${PRODUCT_VER}"
 	VIAddVersionKey "FileDescription" "${PRODUCT_ID} Installer"