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

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

Revision: 1864
          http://sourceforge.net/p/modplug/code/1864
Author:   manxorist
Date:     2013-04-12 16:58:11 +0000 (Fri, 12 Apr 2013)
Log Message:
-----------
[Ref] Remove unneeded __cdecl in mix-plugin related code.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Vstplug.h
    trunk/OpenMPT/soundlib/Snd_fx.cpp
    trunk/OpenMPT/soundlib/Sndfile.h
    trunk/OpenMPT/soundlib/plugins/PlugInterface.h

Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h	2013-04-12 16:34:12 UTC (rev 1863)
+++ trunk/OpenMPT/mptrack/Vstplug.h	2013-04-12 16:58:11 UTC (rev 1864)
@@ -347,7 +347,7 @@
 	VstIntPtr VstCallback(AEffect *effect, VstInt32 opcode, VstInt32 index, VstIntPtr value, void *ptr, float opt);
 	VstIntPtr VstFileSelector(bool destructor, VstFileSelect *fileSel, const AEffect *effect);
 	static VstIntPtr VSTCALLBACK MasterCallBack(AEffect *effect, VstInt32 opcode, VstInt32 index, VstIntPtr value, void *ptr, float opt);
-	static bool __cdecl CreateMixPluginProc(SNDMIXPLUGIN &, CSoundFile &);
+	static bool CreateMixPluginProc(SNDMIXPLUGIN &, CSoundFile &);
 	VstTimeInfo timeInfo;	//rewbs.VSTcompliance
 
 public:

Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-12 16:34:12 UTC (rev 1863)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp	2013-04-12 16:58:11 UTC (rev 1864)
@@ -4712,7 +4712,7 @@
 }
 
 
-PLUGINDEX __cdecl CSoundFile::GetChannelPlugin(CHANNELINDEX nChn, PluginMutePriority respectMutes) const
+PLUGINDEX CSoundFile::GetChannelPlugin(CHANNELINDEX nChn, PluginMutePriority respectMutes) const
 //------------------------------------------------------------------------------------------------------
 {
 	const ModChannel &channel = Chn[nChn];

Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	2013-04-12 16:34:12 UTC (rev 1863)
+++ trunk/OpenMPT/soundlib/Sndfile.h	2013-04-12 16:58:11 UTC (rev 1864)
@@ -59,7 +59,7 @@
 
 #endif
 
-typedef VOID (__cdecl * LPSNDMIXHOOKPROC)(int *, unsigned long, unsigned long); // buffer, samples, channels
+typedef VOID (* LPSNDMIXHOOKPROC)(int *, unsigned long, unsigned long); // buffer, samples, channels
 
 #include "pattern.h"
 #include "patternContainer.h"
@@ -731,9 +731,9 @@
 	}
 
 private:
-	PLUGINDEX __cdecl GetChannelPlugin(CHANNELINDEX nChn, PluginMutePriority respectMutes) const;
-	PLUGINDEX __cdecl GetActiveInstrumentPlugin(CHANNELINDEX, PluginMutePriority respectMutes) const;
-	IMixPlugin *__cdecl GetChannelInstrumentPlugin(CHANNELINDEX chn) const;
+	PLUGINDEX GetChannelPlugin(CHANNELINDEX nChn, PluginMutePriority respectMutes) const;
+	PLUGINDEX GetActiveInstrumentPlugin(CHANNELINDEX, PluginMutePriority respectMutes) const;
+	IMixPlugin * GetChannelInstrumentPlugin(CHANNELINDEX chn) const;
 
 	void HandlePatternTransitionEvents();
 

Modified: trunk/OpenMPT/soundlib/plugins/PlugInterface.h
===================================================================
--- trunk/OpenMPT/soundlib/plugins/PlugInterface.h	2013-04-12 16:34:12 UTC (rev 1863)
+++ trunk/OpenMPT/soundlib/plugins/PlugInterface.h	2013-04-12 16:58:11 UTC (rev 1864)
@@ -199,4 +199,4 @@
 }; // rewbs.dryRatio: Hopefully this doesn't need to be a fixed size.
 
 class CSoundFile;
-typedef bool (__cdecl *PMIXPLUGINCREATEPROC)(SNDMIXPLUGIN &, CSoundFile &);
+typedef bool (*PMIXPLUGINCREATEPROC)(SNDMIXPLUGIN &, CSoundFile &);

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