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

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

Revision: 697
          http://modplug.svn.sourceforge.net/modplug/?rev=697&view=rev
Author:   saga-games
Date:     2010-09-02 23:00:19 +0000 (Thu, 02 Sep 2010)

Log Message:
-----------
[Fix] VST: The time signature sent to VST plugins should now be correct. Since there's only the RPB and RPM values to derive it from, it's not really possible to differentiate between time signatures like 3/4 and 6/8, so quarters are always assumed.
[Mod] OpenMPT: Version is now 1.19.00.02

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Vstplug.cpp
    trunk/OpenMPT/mptrack/version.h

Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp	2010-09-02 22:54:25 UTC (rev 696)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp	2010-09-02 23:00:19 UTC (rev 697)
@@ -778,8 +778,13 @@
 			}
 			if ((value & kVstTimeSigValid) && pSndFile) {
 				timeInfo.flags |= 	kVstTimeSigValid;
-				timeInfo.timeSigNumerator = pSndFile->m_nCurrentRowsPerBeat;
-				timeInfo.timeSigDenominator = pSndFile->m_nCurrentRowsPerMeasure;
+				//timeInfo.timeSigNumerator = pSndFile->m_nCurrentRowsPerBeat;
+				//timeInfo.timeSigDenominator = pSndFile->m_nCurrentRowsPerMeasure;
+
+				// Time signature. numerator = rows per beats / rows pear measure (should sound somewhat logical to you).
+				// the denominator is a bit more tricky, since it cannot be set explicitely. so we just assume quarters for now.
+				timeInfo.timeSigNumerator = pSndFile->m_nCurrentRowsPerMeasure / max(pSndFile->m_nCurrentRowsPerBeat, 1);
+				timeInfo.timeSigDenominator = 4; //gcd(pSndFile->m_nCurrentRowsPerMeasure, pSndFile->m_nCurrentRowsPerBeat);
 			}
 		}
 		return (long)&timeInfo;

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2010-09-02 22:54:25 UTC (rev 696)
+++ trunk/OpenMPT/mptrack/version.h	2010-09-02 23:00:19 UTC (rev 697)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					19
 #define VER_MINOR					00
-#define VER_MINORMINOR				01
+#define VER_MINORMINOR				02
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 


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