[OMPT-svn-commit] SF.net SVN: modplug:[1865] trunk/OpenMPT/soundlib

[<man...@us...>]

Revision: 1865
          http://sourceforge.net/p/modplug/code/1865
Author:   manxorist
Date:     2013-04-12 17:05:17 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
[Ref] Remove pointless __cdecl in CDLSBank.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/Dlsbank.cpp
    trunk/OpenMPT/soundlib/Dlsbank.h

Modified: trunk/OpenMPT/soundlib/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-04-12 16:58:11 UTC (rev 1864)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp	2013-04-12 17:05:17 UTC (rev 1865)
@@ -363,8 +363,8 @@
 /////////////////////////////////////////////////////////////////////
 // Unit conversion
 
-LONG __cdecl CDLSBank::DLS32BitTimeCentsToMilliseconds(LONG lTimeCents)
-//---------------------------------------------------------------------
+LONG CDLSBank::DLS32BitTimeCentsToMilliseconds(LONG lTimeCents)
+//-------------------------------------------------------------
 {
 	// tc = log2(time[secs]) * 1200*65536
 	// time[secs] = 2^(tc/(1200*65536))
@@ -377,16 +377,16 @@
 
 
 // 0dB = 0x10000
-LONG __cdecl CDLSBank::DLS32BitRelativeGainToLinear(LONG lCentibels)
-//------------------------------------------------------------------
+LONG CDLSBank::DLS32BitRelativeGainToLinear(LONG lCentibels)
+//----------------------------------------------------------
 {
 	// v = 10^(cb/(200*65536)) * V
 	return (LONG)(65536.0 * pow(10.0, ((double)lCentibels)/(200*65536.0)) );
 }
 
 
-LONG __cdecl CDLSBank::DLS32BitRelativeLinearToGain(LONG lGain)
-//-------------------------------------------------------------
+LONG CDLSBank::DLS32BitRelativeLinearToGain(LONG lGain)
+//-----------------------------------------------------
 {
 	// cb = log10(v/V) * 200 * 65536
 	if (lGain <= 0) return -960 * 65536;
@@ -394,8 +394,8 @@
 }
 
 
-LONG __cdecl CDLSBank::DLSMidiVolumeToLinear(UINT nMidiVolume)
-//------------------------------------------------------------
+LONG CDLSBank::DLSMidiVolumeToLinear(UINT nMidiVolume)
+//----------------------------------------------------
 {
 	return (nMidiVolume * nMidiVolume << 16) / (127*127);
 }

Modified: trunk/OpenMPT/soundlib/Dlsbank.h
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.h	2013-04-12 16:58:11 UTC (rev 1864)
+++ trunk/OpenMPT/soundlib/Dlsbank.h	2013-04-12 17:05:17 UTC (rev 1865)
@@ -144,8 +144,8 @@
 
 public:
 	// DLS Unit conversion
-	static LONG __cdecl DLS32BitTimeCentsToMilliseconds(LONG lTimeCents);
-	static LONG __cdecl DLS32BitRelativeGainToLinear(LONG lCentibels);	// 0dB = 0x10000
-	static LONG __cdecl DLS32BitRelativeLinearToGain(LONG lGain);		// 0dB = 0x10000
-	static LONG __cdecl DLSMidiVolumeToLinear(UINT nMidiVolume);		// [0-127] -> [0-0x10000]
+	static LONG DLS32BitTimeCentsToMilliseconds(LONG lTimeCents);
+	static LONG DLS32BitRelativeGainToLinear(LONG lCentibels);	// 0dB = 0x10000
+	static LONG DLS32BitRelativeLinearToGain(LONG lGain);		// 0dB = 0x10000
+	static LONG DLSMidiVolumeToLinear(UINT nMidiVolume);		// [0-127] -> [0-0x10000]
 };

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