[OMPT-svn-commit] SF.net SVN: modplug:[5388] trunk/OpenMPT/mptrack/Moddoc.cpp

[<sag...@us...>]

Revision: 5388
          http://sourceforge.net/p/modplug/code/5388
Author:   saga-games
Date:     2015-07-01 22:23:03 +0000 (Wed, 01 Jul 2015)
Log Message:
-----------
[Fix] Approx real BPM didn't show the correct mod tempo.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.cpp

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2015-07-01 19:41:03 UTC (rev 5387)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2015-07-01 22:23:03 UTC (rev 5388)
@@ -2325,12 +2325,11 @@
 	CString Message;
 	double bpm = CMainFrame::GetMainFrame()->GetApproxBPM();
 
-
 	switch(m_SndFile.m_nTempoMode)
 	{
 		case tempoModeAlternative:
-			Message.Format("Using alternative tempo interpretation.\n\nAssuming:\n. %d ticks per second\n. %d ticks per row\n. %d rows per beat\nthe tempo is approximately: %.8g BPM",
-			m_SndFile.m_PlayState.m_nMusicTempo, m_SndFile.m_PlayState.m_nMusicSpeed, m_SndFile.m_PlayState.m_nCurrentRowsPerBeat, bpm);
+			Message.Format("Using alternative tempo interpretation.\n\nAssuming:\n. %.8g ticks per second\n. %d ticks per row\n. %d rows per beat\nthe tempo is approximately: %.8g BPM",
+			m_SndFile.m_PlayState.m_nMusicTempo.ToDouble(), m_SndFile.m_PlayState.m_nMusicSpeed, m_SndFile.m_PlayState.m_nCurrentRowsPerBeat, bpm);
 			break;
 
 		case tempoModeModern:
@@ -2339,8 +2338,8 @@
 
 		case tempoModeClassic:
 		default:
-			Message.Format("Using standard tempo interpretation.\n\nAssuming:\n. A mod tempo (tick duration factor) of %d\n. %d ticks per row\n. %d rows per beat\nthe tempo is approximately: %.8g BPM",
-			m_SndFile.m_PlayState.m_nMusicTempo, m_SndFile.m_PlayState.m_nMusicSpeed, m_SndFile.m_PlayState.m_nCurrentRowsPerBeat, bpm);
+			Message.Format("Using standard tempo interpretation.\n\nAssuming:\n. A mod tempo (tick duration factor) of %.8g\n. %d ticks per row\n. %d rows per beat\nthe tempo is approximately: %.8g BPM",
+			m_SndFile.m_PlayState.m_nMusicTempo.ToDouble(), m_SndFile.m_PlayState.m_nMusicSpeed, m_SndFile.m_PlayState.m_nCurrentRowsPerBeat, bpm);
 			break;
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.