Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1147] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2011-12-11 22:51:06
|
Revision: 1147
http://modplug.svn.sourceforge.net/modplug/?rev=1147&view=rev
Author: saga-games
Date: 2011-12-11 22:50:59 +0000 (Sun, 11 Dec 2011)
Log Message:
-----------
[Mod] Changed Mixmode RC3 default amplification settings from 64/128/128 to 128/48/48 as they were messing horribly with precision and could easily lead to distortion.
[Fix] When creating a XM module, the first sample has panning enabled.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/SoundFilePlayConfig.cpp
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2011-12-10 18:53:45 UTC (rev 1146)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2011-12-11 22:50:59 UTC (rev 1147)
@@ -702,16 +702,16 @@
m_SndFile.m_nMusicSpeed = m_SndFile.m_nDefaultSpeed = 6;
// Set up levels
- if(m_SndFile.m_nMixLevels == mixLevels_original || m_SndFile.m_nMixLevels == mixLevels_compatible)
+ //if(m_SndFile.m_nMixLevels == mixLevels_original || m_SndFile.m_nMixLevels == mixLevels_compatible)
{
m_SndFile.m_nGlobalVolume = m_SndFile.m_nDefaultGlobalVolume = MAX_GLOBAL_VOLUME;
m_SndFile.m_nSamplePreAmp = m_SndFile.m_nVSTiVolume = 48;
}
- else
+ /*else
{
m_SndFile.m_nGlobalVolume = m_SndFile.m_nDefaultGlobalVolume = MAX_GLOBAL_VOLUME / 2;
m_SndFile.m_nSamplePreAmp = m_SndFile.m_nVSTiVolume = 128;
- }
+ }*/
for (CHANNELINDEX nChn = 0; nChn < MAX_BASECHANNELS; nChn++)
{
@@ -727,14 +727,12 @@
{
strcpy(m_SndFile.m_szNames[1], "untitled");
m_SndFile.m_nSamples = (GetModType() == MOD_TYPE_MOD) ? 31 : 1;
- if(GetModType() == MOD_TYPE_XM)
- {
- m_SndFile.GetSample(1).uFlags |= CHN_PANNING;
- }
ctrlSmp::ResetSamples(m_SndFile, ctrlSmp::SmpResetInit);
- if ((!m_SndFile.m_nInstruments) && (m_SndFile.m_nType & MOD_TYPE_XM))
+ InitializeSample(m_SndFile.GetSample(1));
+
+ if ((!m_SndFile.m_nInstruments) && (m_SndFile.GetType() & MOD_TYPE_XM))
{
try
{
@@ -745,7 +743,7 @@
{
}
}
- if (m_SndFile.m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT|MOD_TYPE_XM))
+ if (m_SndFile.GetType() & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_XM))
{
m_SndFile.m_dwSongFlags |= SONG_LINEARSLIDES;
}
Modified: trunk/OpenMPT/mptrack/SoundFilePlayConfig.cpp
===================================================================
--- trunk/OpenMPT/mptrack/SoundFilePlayConfig.cpp 2011-12-10 18:53:45 UTC (rev 1146)
+++ trunk/OpenMPT/mptrack/SoundFilePlayConfig.cpp 2011-12-11 22:50:59 UTC (rev 1147)
@@ -2,14 +2,19 @@
#include "Sndfile.h"
#include ".\soundfileplayconfig.h"
-CSoundFilePlayConfig::CSoundFilePlayConfig(void) {
+CSoundFilePlayConfig::CSoundFilePlayConfig()
+//------------------------------------------
+{
setVSTiVolume(1.0f);
}
-CSoundFilePlayConfig::~CSoundFilePlayConfig(void) {
+CSoundFilePlayConfig::~CSoundFilePlayConfig()
+//-------------------------------------------
+{
}
void CSoundFilePlayConfig::SetMixLevels(int mixLevelType)
+//-------------------------------------------------------
{
switch (mixLevelType)
{
@@ -91,8 +96,8 @@
setUseGlobalPreAmp(false);
setForcePanningMode(forceNoSoftPanning);
setDisplayDBValues(true);
- setNormalSamplePreAmp(48.0);
- setNormalVSTiVol(48.0);
+ setNormalSamplePreAmp(256.0);
+ setNormalVSTiVol(256.0);
setNormalGlobalVol(256.0);
setExtraSampleAttenuation(1);
break;
@@ -122,110 +127,156 @@
//getters and setters.
-bool CSoundFilePlayConfig::getGlobalVolumeAppliesToMaster() {
+bool CSoundFilePlayConfig::getGlobalVolumeAppliesToMaster()
+//---------------------------------------------------------
+{
return m_globalVolumeAppliesToMaster;
}
-void CSoundFilePlayConfig::setGlobalVolumeAppliesToMaster(bool inGlobalVolumeAppliesToMaster){
+void CSoundFilePlayConfig::setGlobalVolumeAppliesToMaster(bool inGlobalVolumeAppliesToMaster)
+//-------------------------------------------------------------------------------------------
+{
m_globalVolumeAppliesToMaster=inGlobalVolumeAppliesToMaster;
}
-float CSoundFilePlayConfig::getVSTiGainFactor() {
+float CSoundFilePlayConfig::getVSTiGainFactor()
+//---------------------------------------------
+{
return m_VSTiVolume;
}
-float CSoundFilePlayConfig::getVSTiVolume() {
+float CSoundFilePlayConfig::getVSTiVolume()
+//-----------------------------------------
+{
return m_VSTiVolume;
}
-void CSoundFilePlayConfig::setVSTiVolume(float inVSTiVolume) {
+void CSoundFilePlayConfig::setVSTiVolume(float inVSTiVolume)
+//-----------------------------------------------------------
+{
m_VSTiVolume = inVSTiVolume;
}
-float CSoundFilePlayConfig::getVSTiAttenuation() {
+float CSoundFilePlayConfig::getVSTiAttenuation()
+//----------------------------------------------
+{
return m_VSTiAttenuation;
}
-void CSoundFilePlayConfig::setVSTiAttenuation(float inVSTiAttenuation) {
+void CSoundFilePlayConfig::setVSTiAttenuation(float inVSTiAttenuation)
+//---------------------------------------------------------------------
+{
m_VSTiAttenuation = inVSTiAttenuation;
}
-float CSoundFilePlayConfig::getIntToFloat() {
+float CSoundFilePlayConfig::getIntToFloat()
+//-----------------------------------------
+{
return m_IntToFloat;
}
-void CSoundFilePlayConfig::setIntToFloat(float inIntToFloat) {
- m_IntToFloat=inIntToFloat;
+void CSoundFilePlayConfig::setIntToFloat(float inIntToFloat)
+//-----------------------------------------------------------
+{
+ m_IntToFloat = inIntToFloat;
}
-float CSoundFilePlayConfig::getFloatToInt() {
+float CSoundFilePlayConfig::getFloatToInt()
+//-----------------------------------------
+{
return m_FloatToInt;
}
-void CSoundFilePlayConfig::setFloatToInt(float inFloatToInt) {
- m_FloatToInt=inFloatToInt;
+void CSoundFilePlayConfig::setFloatToInt(float inFloatToInt)
+//-----------------------------------------------------------
+{
+ m_FloatToInt = inFloatToInt;
}
-bool CSoundFilePlayConfig::getUseGlobalPreAmp() {
+bool CSoundFilePlayConfig::getUseGlobalPreAmp()
+//---------------------------------------------
+{
return m_ignorePreAmp;
}
-void CSoundFilePlayConfig::setUseGlobalPreAmp(bool inUseGlobalPreAmp) {
- m_ignorePreAmp=inUseGlobalPreAmp;
+void CSoundFilePlayConfig::setUseGlobalPreAmp(bool inUseGlobalPreAmp)
+//-------------------------------------------------------------------
+{
+ m_ignorePreAmp = inUseGlobalPreAmp;
}
-forcePanningMode CSoundFilePlayConfig::getForcePanningMode() {
+forcePanningMode CSoundFilePlayConfig::getForcePanningMode()
+//----------------------------------------------------------
+{
return m_forceSoftPanning;
}
-void CSoundFilePlayConfig::setForcePanningMode(forcePanningMode inForceSoftPanning) {
- m_forceSoftPanning=inForceSoftPanning;
+void CSoundFilePlayConfig::setForcePanningMode(forcePanningMode inForceSoftPanning)
+//---------------------------------------------------------------------------------
+{
+ m_forceSoftPanning = inForceSoftPanning;
}
-void CSoundFilePlayConfig::setDisplayDBValues(bool in) {
- m_displayDBValues=in;
+void CSoundFilePlayConfig::setDisplayDBValues(bool in)
+//----------------------------------------------------
+{
+ m_displayDBValues = in;
}
-void CSoundFilePlayConfig::setNormalSamplePreAmp(double in) {
- m_normalSamplePreAmp=in;
+void CSoundFilePlayConfig::setNormalSamplePreAmp(double in)
+//---------------------------------------------------------
+{
+ m_normalSamplePreAmp = in;
}
-void CSoundFilePlayConfig::setNormalVSTiVol(double in) {
- m_normalVSTiVol=in;
+void CSoundFilePlayConfig::setNormalVSTiVol(double in)
+//----------------------------------------------------
+{
+ m_normalVSTiVol = in;
}
-void CSoundFilePlayConfig::setNormalGlobalVol(double in) {
- m_normalGlobalVol=in;
+void CSoundFilePlayConfig::setNormalGlobalVol(double in)
+//------------------------------------------------------
+{
+ m_normalGlobalVol = in;
}
-bool CSoundFilePlayConfig::getDisplayDBValues() {
+bool CSoundFilePlayConfig::getDisplayDBValues()
+//---------------------------------------------
+{
return m_displayDBValues;
}
-double CSoundFilePlayConfig::getNormalSamplePreAmp() {
+double CSoundFilePlayConfig::getNormalSamplePreAmp()
+//--------------------------------------------------
+{
return m_normalSamplePreAmp;
}
-double CSoundFilePlayConfig::getNormalVSTiVol() {
+double CSoundFilePlayConfig::getNormalVSTiVol()
+//---------------------------------------------
+{
return m_normalVSTiVol;
}
-double CSoundFilePlayConfig::getNormalGlobalVol() {
+double CSoundFilePlayConfig::getNormalGlobalVol()
+//-----------------------------------------------
+{
return m_normalGlobalVol;
}
void CSoundFilePlayConfig::setExtraSampleAttenuation(int attn)
+//------------------------------------------------------------
{
m_extraAttenuation = attn;
}
int CSoundFilePlayConfig::getExtraSampleAttenuation()
+//---------------------------------------------------
{
return m_extraAttenuation;
}
-
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
