Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1772] trunk/OpenMPT
|
From: <sag...@us...> - 2013-04-07 22:43:48
|
Revision: 1772
http://sourceforge.net/p/modplug/code/1772
Author: saga-games
Date: 2013-04-07 22:43:38 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
[Ref] Made CSoundFile::m_pConfig a normal member instead of pointer.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_gen.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/ModConvert.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/sounddsp/EQ.cpp
trunk/OpenMPT/sounddsp/EQ.h
trunk/OpenMPT/soundlib/Fastmix.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Sndmix.cpp
trunk/OpenMPT/soundlib/SoundFilePlayConfig.cpp
trunk/OpenMPT/soundlib/SoundFilePlayConfig.h
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -539,20 +539,20 @@
const char moreRecentMixModeNote[] = "Use a more recent mixmode to see dB offsets.";
if ((pszText) && (uId))
{
- const bool displayDBValues = m_pSndFile->m_pConfig->getDisplayDBValues();
+ const bool displayDBValues = m_pSndFile->m_PlayConfig.getDisplayDBValues();
switch(uId)
{
case IDC_SLIDER_SAMPLEPREAMP:
- (displayDBValues) ? setAsDecibels(pszText, m_pSndFile->m_nSamplePreAmp, m_pSndFile->m_pConfig->getNormalSamplePreAmp()) : wsprintf(pszText, moreRecentMixModeNote);
+ (displayDBValues) ? setAsDecibels(pszText, m_pSndFile->m_nSamplePreAmp, m_pSndFile->m_PlayConfig.getNormalSamplePreAmp()) : wsprintf(pszText, moreRecentMixModeNote);
return TRUE;
break;
case IDC_SLIDER_VSTIVOL:
- (displayDBValues) ? setAsDecibels(pszText, m_pSndFile->m_nVSTiVolume, m_pSndFile->m_pConfig->getNormalVSTiVol()) : wsprintf(pszText, moreRecentMixModeNote);
+ (displayDBValues) ? setAsDecibels(pszText, m_pSndFile->m_nVSTiVolume, m_pSndFile->m_PlayConfig.getNormalVSTiVol()) : wsprintf(pszText, moreRecentMixModeNote);
return TRUE;
break;
case IDC_SLIDER_GLOBALVOL:
- (displayDBValues) ? setAsDecibels(pszText, m_pSndFile->m_nGlobalVolume, m_pSndFile->m_pConfig->getNormalGlobalVol()) : wsprintf(pszText, moreRecentMixModeNote);
+ (displayDBValues) ? setAsDecibels(pszText, m_pSndFile->m_nGlobalVolume, m_pSndFile->m_PlayConfig.getNormalGlobalVol()) : wsprintf(pszText, moreRecentMixModeNote);
return TRUE;
break;
}
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -1660,7 +1660,7 @@
m_WaveFile.Destroy();
m_WaveFile.Create(NULL, 0);
// Avoid global volume ramping when trying samples in the treeview.
- m_WaveFile.m_pConfig->setGlobalVolumeAppliesToMaster(false);
+ m_WaveFile.m_PlayConfig.setGlobalVolumeAppliesToMaster(false);
m_WaveFile.m_nDefaultGlobalVolume = m_WaveFile.m_nGlobalVolume = MAX_GLOBAL_VOLUME;
m_WaveFile.m_nSamplePreAmp = 48;
m_WaveFile.m_nDefaultTempo = 125;
Modified: trunk/OpenMPT/mptrack/ModConvert.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ModConvert.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/mptrack/ModConvert.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -490,7 +490,7 @@
if(newTypeIsMOD || newTypeIsS3M)
{
m_SndFile.m_nMixLevels = mixLevels_compatible;
- m_SndFile.m_pConfig->SetMixLevels(mixLevels_compatible);
+ m_SndFile.m_PlayConfig.SetMixLevels(mixLevels_compatible);
}
if(oldTypeIsMPT && m_SndFile.m_nMixLevels != mixLevels_compatible)
{
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -699,7 +699,7 @@
// Refresh mix levels now that the correct mod type has been set
m_SndFile.m_nMixLevels = m_SndFile.GetModSpecifications().defaultMixLevels;
- m_SndFile.m_pConfig->SetMixLevels(m_SndFile.m_nMixLevels);
+ m_SndFile.m_PlayConfig.SetMixLevels(m_SndFile.m_nMixLevels);
// ...and the order length
m_SndFile.Order.resize(min(ModSequenceSet::s_nCacheSize, m_SndFile.GetModSpecifications().ordersMax));
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -2029,8 +2029,8 @@
if(m_bIsInstrument)
{
- gain /= m_SndFile.m_pConfig->getVSTiAttenuation();
- gain = static_cast<float>(gain * (m_SndFile.m_nVSTiVolume / m_SndFile.m_pConfig->getNormalVSTiVol()));
+ gain /= m_SndFile.m_PlayConfig.getVSTiAttenuation();
+ gain = static_cast<float>(gain * (m_SndFile.m_nVSTiVolume / m_SndFile.m_PlayConfig.getNormalVSTiVol()));
}
m_fGain = gain;
}
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -362,7 +362,7 @@
if (sel >= 0)
{
sndFile.m_nMixLevels = m_PlugMixBox.GetItemData(sel);
- sndFile.m_pConfig->SetMixLevels(sndFile.m_nMixLevels);
+ sndFile.m_PlayConfig.SetMixLevels(sndFile.m_nMixLevels);
sndFile.RecalculateGainForAllPlugs();
}
Modified: trunk/OpenMPT/sounddsp/EQ.cpp
===================================================================
--- trunk/OpenMPT/sounddsp/EQ.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/sounddsp/EQ.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -326,20 +326,20 @@
#endif
-void CEQ::ProcessMono(int *pbuffer, UINT nCount, CSoundFilePlayConfig *pConfig)
-//------------------------------------------------------------------------
+void CEQ::ProcessMono(int *pbuffer, UINT nCount, CSoundFilePlayConfig &config)
+//----------------------------------------------------------------------------
{
- X86_MonoMixToFloat(pbuffer, MixFloatBuffer, nCount, pConfig->getIntToFloat());
+ X86_MonoMixToFloat(pbuffer, MixFloatBuffer, nCount, config.getIntToFloat());
for (UINT b=0; b<MAX_EQ_BANDS; b++)
{
if ((gEQ[b].bEnable) && (gEQ[b].Gain != 1.0f)) EQFilter(&gEQ[b], MixFloatBuffer, nCount);
}
- X86_FloatToMonoMix(MixFloatBuffer, pbuffer, nCount, pConfig->getFloatToInt());
+ X86_FloatToMonoMix(MixFloatBuffer, pbuffer, nCount, config.getFloatToInt());
}
-void CEQ::ProcessStereo(int *pbuffer, UINT nCount, CSoundFilePlayConfig *pConfig, DWORD SoundSetupFlags, DWORD SysInfoFlags)
-//---------------------------------------------------------------------------------------------------------------------------
+void CEQ::ProcessStereo(int *pbuffer, UINT nCount, CSoundFilePlayConfig &config, DWORD SoundSetupFlags, DWORD SysInfoFlags)
+//-------------------------------------------------------------------------------------------------------------------------
{
#ifdef ENABLE_SSE
@@ -348,9 +348,9 @@
// Still allow the check, because the user can turn this on/off
if ((SysInfoFlags & SYSMIX_SSE) && (SoundSetupFlags & SNDMIX_ENABLEMMX))
- {
+ {
int sse_state, sse_eqstate;
- SSE_MonoMixToFloat(pbuffer, MixFloatBuffer, nCount*2, pConfig->getIntToFloat());
+ SSE_MonoMixToFloat(pbuffer, MixFloatBuffer, nCount*2, config.getIntToFloat());
_asm stmxcsr sse_state;
sse_eqstate = sse_state | 0xFF80;
@@ -362,7 +362,7 @@
}
_asm ldmxcsr sse_state;
- X86_FloatToMonoMix(MixFloatBuffer, pbuffer, nCount*2, pConfig->getFloatToInt());
+ X86_FloatToMonoMix(MixFloatBuffer, pbuffer, nCount*2, config.getFloatToInt());
} else
@@ -370,12 +370,12 @@
#endif // ENABLE_SSE
#ifdef ENABLE_3DNOW
-
- // We still perform the MMX check because the user can enable/disable this
+ // We still perform the MMX check because the user can enable/disable this
+
if ((SysInfoFlags & SYSMIX_3DNOW) && (SoundSetupFlags & SNDMIX_ENABLEMMX))
{
- AMD_MonoMixToFloat(pbuffer, MixFloatBuffer, nCount*2, pConfig->getIntToFloat());
+ AMD_MonoMixToFloat(pbuffer, MixFloatBuffer, nCount*2, config.getIntToFloat());
for (UINT b=0; b<MAX_EQ_BANDS; b++)
{
@@ -384,13 +384,13 @@
AMD_StereoEQ(&gEQ[b], &gEQ[b+MAX_EQ_BANDS], MixFloatBuffer, nCount);
}
- AMD_FloatToMonoMix(MixFloatBuffer, pbuffer, nCount*2, pConfig->getFloatToInt());
+ AMD_FloatToMonoMix(MixFloatBuffer, pbuffer, nCount*2, config.getFloatToInt());
} else
#endif // ENABLE_3DNOW
{
- X86_StereoMixToFloat(pbuffer, MixFloatBuffer, MixFloatBuffer+MIXBUFFERSIZE, nCount, pConfig->getIntToFloat());
+ X86_StereoMixToFloat(pbuffer, MixFloatBuffer, MixFloatBuffer+MIXBUFFERSIZE, nCount, config.getIntToFloat());
for (UINT bl=0; bl<MAX_EQ_BANDS; bl++)
{
@@ -401,7 +401,7 @@
if ((gEQ[br].bEnable) && (gEQ[br].Gain != 1.0f)) EQFilter(&gEQ[br], MixFloatBuffer+MIXBUFFERSIZE, nCount);
}
- X86_FloatToStereoMix(MixFloatBuffer, MixFloatBuffer+MIXBUFFERSIZE, pbuffer, nCount, pConfig->getFloatToInt());
+ X86_FloatToStereoMix(MixFloatBuffer, MixFloatBuffer+MIXBUFFERSIZE, pbuffer, nCount, config.getFloatToInt());
}
}
Modified: trunk/OpenMPT/sounddsp/EQ.h
===================================================================
--- trunk/OpenMPT/sounddsp/EQ.h 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/sounddsp/EQ.h 2013-04-07 22:43:38 UTC (rev 1772)
@@ -40,8 +40,8 @@
~CEQ() {}
public:
void Initialize(BOOL bReset, DWORD MixingFreq);
- void ProcessStereo(int *pbuffer, UINT nCount, CSoundFilePlayConfig *pConfig, DWORD SoundSetupFlags, DWORD SysInfoFlags);
- void ProcessMono(int *pbuffer, UINT nCount, CSoundFilePlayConfig *pConfig);
+ void ProcessStereo(int *pbuffer, UINT nCount, CSoundFilePlayConfig &config, DWORD SoundSetupFlags, DWORD SysInfoFlags);
+ void ProcessMono(int *pbuffer, UINT nCount, CSoundFilePlayConfig &config);
void SetEQGains(const UINT *pGains, UINT nGains, const UINT *pFreqs, BOOL bReset, DWORD MixingFreq);
};
Modified: trunk/OpenMPT/soundlib/Fastmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Fastmix.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/soundlib/Fastmix.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -1804,20 +1804,20 @@
#ifdef ENABLE_SSE
if(gdwSysInfo & SYSMIX_SSE)
{
- SSE_StereoMixToFloat(pSrc, pOut1, pOut2, nCount, m_pConfig->getIntToFloat());
+ SSE_StereoMixToFloat(pSrc, pOut1, pOut2, nCount, m_PlayConfig.getIntToFloat());
return;
}
#endif // ENABLE_SSE
#ifdef ENABLE_3DNOW
if(gdwSysInfo & SYSMIX_3DNOW)
{
- AMD_StereoMixToFloat(pSrc, pOut1, pOut2, nCount, m_pConfig->getIntToFloat());
+ AMD_StereoMixToFloat(pSrc, pOut1, pOut2, nCount, m_PlayConfig.getIntToFloat());
return;
}
#endif // ENABLE_3DNOW
}
- X86_StereoMixToFloat(pSrc, pOut1, pOut2, nCount, m_pConfig->getIntToFloat());
+ X86_StereoMixToFloat(pSrc, pOut1, pOut2, nCount, m_PlayConfig.getIntToFloat());
}
@@ -1830,12 +1830,12 @@
#ifdef ENABLE_3DNOW
if(gdwSysInfo & SYSMIX_3DNOW)
{
- AMD_FloatToStereoMix(pIn1, pIn2, pOut, nCount, m_pConfig->getFloatToInt());
+ AMD_FloatToStereoMix(pIn1, pIn2, pOut, nCount, m_PlayConfig.getFloatToInt());
return;
}
#endif // ENABLE_3DNOW
}
- X86_FloatToStereoMix(pIn1, pIn2, pOut, nCount, m_pConfig->getFloatToInt());
+ X86_FloatToStereoMix(pIn1, pIn2, pOut, nCount, m_PlayConfig.getFloatToInt());
}
@@ -1847,19 +1847,19 @@
#ifdef ENABLE_SSE
if(gdwSysInfo & SYSMIX_SSE)
{
- SSE_MonoMixToFloat(pSrc, pOut, nCount, m_pConfig->getIntToFloat());
+ SSE_MonoMixToFloat(pSrc, pOut, nCount, m_PlayConfig.getIntToFloat());
return;
}
#endif // ENABLE_SSE
#ifdef ENABLE_3DNOW
if(gdwSysInfo & SYSMIX_3DNOW)
{
- AMD_MonoMixToFloat(pSrc, pOut, nCount, m_pConfig->getIntToFloat());
+ AMD_MonoMixToFloat(pSrc, pOut, nCount, m_PlayConfig.getIntToFloat());
return;
}
#endif // ENABLE_3DNOW
}
- X86_MonoMixToFloat(pSrc, pOut, nCount, m_pConfig->getIntToFloat());
+ X86_MonoMixToFloat(pSrc, pOut, nCount, m_PlayConfig.getIntToFloat());
}
@@ -1872,12 +1872,12 @@
#ifdef ENABLE_3DNOW
if(gdwSysInfo & SYSMIX_3DNOW)
{
- AMD_FloatToMonoMix(pIn, pOut, nCount, m_pConfig->getFloatToInt());
+ AMD_FloatToMonoMix(pIn, pOut, nCount, m_PlayConfig.getFloatToInt());
return;
}
#endif // ENABLE_3DNOW
}
- X86_FloatToMonoMix(pIn, pOut, nCount, m_pConfig->getFloatToInt());
+ X86_FloatToMonoMix(pIn, pOut, nCount, m_PlayConfig.getFloatToInt());
}
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -463,7 +463,6 @@
m_lTotalSampleCount = 0;
m_bPositionChanged = true;
- m_pConfig = new CSoundFilePlayConfig();
m_pTuningsTuneSpecific = new CTuningCollection("Tune specific tunings");
}
@@ -471,7 +470,6 @@
CSoundFile::~CSoundFile()
//-----------------------
{
- delete m_pConfig;
delete m_pTuningsTuneSpecific;
Destroy();
}
@@ -792,7 +790,7 @@
#endif // NO_VST
// Set up mix levels
- m_pConfig->SetMixLevels(m_nMixLevels);
+ m_PlayConfig.SetMixLevels(m_nMixLevels);
RecalculateGainForAllPlugs();
if(GetType() != MOD_TYPE_NONE)
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2013-04-07 22:43:38 UTC (rev 1772)
@@ -318,7 +318,7 @@
char m_szNames[MAX_SAMPLES][MAX_SAMPLENAME]; // Song and sample names
std::bitset<MAX_BASECHANNELS> m_bChannelMuteTogglePending;
- CSoundFilePlayConfig* m_pConfig;
+ CSoundFilePlayConfig m_PlayConfig;
DWORD m_dwCreatedWithVersion;
DWORD m_dwLastSavedWithVersion;
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -306,7 +306,7 @@
if (nMaxPlugins) ProcessPlugins(lCount);
// Apply global volume
- if (m_pConfig->getGlobalVolumeAppliesToMaster())
+ if (m_PlayConfig.getGlobalVolumeAppliesToMaster())
{
ApplyGlobalVolume(MixSoundBuffer, MixRearBuffer, lSampleCount);
}
@@ -322,7 +322,7 @@
X86_MonoFromStereo(MixSoundBuffer, lCount);
// Apply global volume
- if (m_pConfig->getGlobalVolumeAppliesToMaster())
+ if (m_PlayConfig.getGlobalVolumeAppliesToMaster())
{
ApplyGlobalVolume(MixSoundBuffer, nullptr, lSampleCount);
}
@@ -337,9 +337,9 @@
if (gdwSoundSetup & SNDMIX_EQ)
{
if (gnChannels >= 2)
- m_EQ.ProcessStereo(MixSoundBuffer, lCount, m_pConfig, gdwSoundSetup, gdwSysInfo);
+ m_EQ.ProcessStereo(MixSoundBuffer, lCount, m_PlayConfig, gdwSoundSetup, gdwSysInfo);
else
- m_EQ.ProcessMono(MixSoundBuffer, lCount, m_pConfig);
+ m_EQ.ProcessMono(MixSoundBuffer, lCount, m_PlayConfig);
}
#endif // NO_EQ
@@ -1664,7 +1664,7 @@
DWORD mastervol;
- if (m_pConfig->getUseGlobalPreAmp())
+ if (m_PlayConfig.getUseGlobalPreAmp())
{
int realmastervol = m_nMasterVolume;
if (realmastervol > 0x80)
@@ -1684,7 +1684,7 @@
mastervol = Util::muldiv(mastervol, m_nGlobalFadeSamples, m_nGlobalFadeMaxSamples);
}
- if (m_pConfig->getUseGlobalPreAmp())
+ if (m_PlayConfig.getUseGlobalPreAmp())
{
UINT attenuation =
#ifndef NO_AGC
@@ -1797,7 +1797,7 @@
if(pChn->dwFlags[CHN_SYNCMUTE])
{
pChn->nRealVolume = 0;
- } else if (m_pConfig->getGlobalVolumeAppliesToMaster())
+ } else if (m_PlayConfig.getGlobalVolumeAppliesToMaster())
{
// Don't let global volume affect level of sample if
// Global volume is going to be applied to master output anyway.
@@ -1962,7 +1962,7 @@
#endif
#ifdef MODPLUG_TRACKER
- const UINT kChnMasterVol = pChn->dwFlags[CHN_EXTRALOUD] ? 0x100 : nMasterVol;
+ const UINT kChnMasterVol = pChn->dwFlags[CHN_EXTRALOUD] ? (UINT)m_PlayConfig.getNormalSamplePreAmp() : nMasterVol;
#else
#define kChnMasterVol nMasterVol
#endif // MODPLUG_TRACKER
@@ -1977,7 +1977,7 @@
Limit(pan, 0, 256);
LONG realvol;
- if (m_pConfig->getUseGlobalPreAmp())
+ if (m_PlayConfig.getUseGlobalPreAmp())
{
realvol = (pChn->nRealVolume * kChnMasterVol) >> 7;
} else
@@ -1986,7 +1986,7 @@
realvol = (pChn->nRealVolume * kChnMasterVol) >> 8;
}
- const forcePanningMode panningMode = m_pConfig->getForcePanningMode();
+ const forcePanningMode panningMode = m_PlayConfig.getForcePanningMode();
if (panningMode == forceSoftPanning || (panningMode == dontForcePanningMode && (gdwSoundSetup & SNDMIX_SOFTPANNING)))
{
if (pan < 128)
@@ -2054,7 +2054,7 @@
pChn->nNewRightVol >>= MIXING_ATTENUATION;
pChn->nNewLeftVol >>= MIXING_ATTENUATION;
}*/
- const int extraAttenuation = m_pConfig->getExtraSampleAttenuation();
+ const int extraAttenuation = m_PlayConfig.getExtraSampleAttenuation();
pChn->nNewRightVol >>= extraAttenuation;
pChn->nNewLeftVol >>= extraAttenuation;
Modified: trunk/OpenMPT/soundlib/SoundFilePlayConfig.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SoundFilePlayConfig.cpp 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/soundlib/SoundFilePlayConfig.cpp 2013-04-07 22:43:38 UTC (rev 1772)
@@ -31,7 +31,7 @@
{
// Olivier's version gives us floats in [-0.5; 0.5] and slightly saturates VSTis.
- case mixLevels_original:
+ case mixLevels_original:
setVSTiAttenuation(NO_ATTENUATION);
setIntToFloat(1.0f/static_cast<float>(1<<28));
setFloatToInt(static_cast<float>(1<<28));
@@ -39,7 +39,7 @@
setUseGlobalPreAmp(true);
setForcePanningMode(dontForcePanningMode);
setDisplayDBValues(false);
- setNormalSamplePreAmp(128.0);
+ setNormalSamplePreAmp(256.0);
setNormalVSTiVol(100.0);
setNormalGlobalVol(128.0);
setExtraSampleAttenuation(MIXING_ATTENUATION);
@@ -47,7 +47,7 @@
// Ericus' version gives us floats in [-0.06;0.06] and requires attenuation to
// avoid massive VSTi saturation.
- case mixLevels_117RC1:
+ case mixLevels_117RC1:
setVSTiAttenuation(32.0f);
setIntToFloat(1.0f/static_cast<float>(0x07FFFFFFF));
setFloatToInt(static_cast<float>(0x07FFFFFFF));
@@ -55,7 +55,7 @@
setUseGlobalPreAmp(true);
setForcePanningMode(dontForcePanningMode);
setDisplayDBValues(false);
- setNormalSamplePreAmp(128.0);
+ setNormalSamplePreAmp(256.0);
setNormalVSTiVol(100.0);
setNormalGlobalVol(128.0);
setExtraSampleAttenuation(MIXING_ATTENUATION);
@@ -72,7 +72,7 @@
setUseGlobalPreAmp(true);
setForcePanningMode(dontForcePanningMode);
setDisplayDBValues(false);
- setNormalSamplePreAmp(128.0);
+ setNormalSamplePreAmp(256.0);
setNormalVSTiVol(100.0);
setNormalGlobalVol(128.0);
setExtraSampleAttenuation(MIXING_ATTENUATION);
@@ -114,7 +114,7 @@
break;
}
-
+
return;
}
Modified: trunk/OpenMPT/soundlib/SoundFilePlayConfig.h
===================================================================
--- trunk/OpenMPT/soundlib/SoundFilePlayConfig.h 2013-04-07 21:29:10 UTC (rev 1771)
+++ trunk/OpenMPT/soundlib/SoundFilePlayConfig.h 2013-04-07 22:43:38 UTC (rev 1772)
@@ -18,11 +18,11 @@
MIXING_CLIPMAX = 0x07FFFFFF,
};
-enum
+enum tempoMode
{
- tempo_mode_classic = 0,
- tempo_mode_alternative = 1,
- tempo_mode_modern = 2,
+ tempo_mode_classic = 0,
+ tempo_mode_alternative = 1,
+ tempo_mode_modern = 2,
};
enum mixLevels
@@ -64,7 +64,7 @@
void setVSTiVolume(float);
float getVSTiVolume();
- void setGlobalVolumeAppliesToMaster(bool);
+ void setGlobalVolumeAppliesToMaster(bool);
bool getGlobalVolumeAppliesToMaster();
void setUseGlobalPreAmp(bool);
@@ -90,13 +90,13 @@
private:
-//calculated internally (getters only):
+//calculated internally (getters only):
float getVSTiGainFactor();
float m_IntToFloat;
float m_FloatToInt;
- float m_VSTiAttenuation;
- float m_VSTiVolume;
+ float m_VSTiAttenuation;
+ float m_VSTiVolume;
double m_normalSamplePreAmp;
double m_normalVSTiVol;
@@ -108,8 +108,5 @@
bool m_displayDBValues;
int m_extraAttenuation;
-
- DWORD m_LastSavedWithVersion;
- DWORD m_CreatedWithVersion;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
