Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1719] trunk/OpenMPT
|
From: <sag...@us...> - 2013-04-03 14:51:28
|
Revision: 1719
http://sourceforge.net/p/modplug/code/1719
Author: saga-games
Date: 2013-04-03 14:51:10 +0000 (Wed, 03 Apr 2013)
Log Message:
-----------
[Reg] Removed poorly implemented Invert Stereo option. It's not 1995 anymore.
[Mod] OpenMPT: Version is now 1.21.01.26
Modified Paths:
--------------
trunk/OpenMPT/common/version.h
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/soundlib/Snd_defs.h
trunk/OpenMPT/soundlib/Sndmix.cpp
Modified: trunk/OpenMPT/common/version.h
===================================================================
--- trunk/OpenMPT/common/version.h 2013-04-03 13:25:13 UTC (rev 1718)
+++ trunk/OpenMPT/common/version.h 2013-04-03 14:51:10 UTC (rev 1719)
@@ -19,7 +19,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 21
#define VER_MINOR 01
-#define VER_MINORMINOR 25
+#define VER_MINORMINOR 26
//Creates version number from version parts that appears in version string.
//For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2013-04-03 13:25:13 UTC (rev 1718)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2013-04-03 14:51:10 UTC (rev 1719)
@@ -1089,10 +1089,6 @@
TrackerSettings::Instance().m_nBitsPerSample,
TrackerSettings::Instance().m_nChannels,
(TrackerSettings::Instance().m_dwSoundSetup & SOUNDSETUP_ENABLEMMX) ? TRUE : FALSE);
- if (TrackerSettings::Instance().m_dwSoundSetup & SOUNDSETUP_STREVERSE)
- CSoundFile::gdwSoundSetup |= SNDMIX_REVERSESTEREO;
- else
- CSoundFile::gdwSoundSetup &= ~SNDMIX_REVERSESTEREO;
// Soft panning
if (TrackerSettings::Instance().m_dwSoundSetup & SOUNDSETUP_SOFTPANNING)
@@ -1256,8 +1252,6 @@
//----------------------------------------------------------
{
if(!pSndFile) return;
- if (TrackerSettings::Instance().m_dwSoundSetup & SOUNDSETUP_STREVERSE) CSoundFile::gdwSoundSetup |= SNDMIX_REVERSESTEREO;
- else CSoundFile::gdwSoundSetup &= ~SNDMIX_REVERSESTEREO;
pSndFile->SetWaveConfig(TrackerSettings::Instance().m_dwRate, TrackerSettings::Instance().m_nBitsPerSample, TrackerSettings::Instance().m_nChannels, (TrackerSettings::Instance().m_dwSoundSetup & SOUNDSETUP_ENABLEMMX) ? TRUE : FALSE);
pSndFile->SetResamplingMode(TrackerSettings::Instance().m_nSrcMode);
UpdateDspEffects();
@@ -1648,7 +1642,7 @@
m_WaveFile.m_nSamplePreAmp = 48;
m_WaveFile.m_nDefaultTempo = 125;
m_WaveFile.m_nDefaultSpeed = 6;
- m_WaveFile.m_nType = MOD_TYPE_IT;
+ m_WaveFile.m_nType = MOD_TYPE_MPT;
m_WaveFile.m_nChannels = 4;
m_WaveFile.m_nInstruments = 1;
m_WaveFile.m_nTempoMode = tempo_mode_classic;
@@ -1737,10 +1731,6 @@
// No need to restart playback
TrackerSettings::Instance().m_dwSoundSetup = q;
CSoundFile::EnableMMX((TrackerSettings::Instance().m_dwSoundSetup & SOUNDSETUP_ENABLEMMX) != 0);
- if (TrackerSettings::Instance().m_dwSoundSetup & SOUNDSETUP_STREVERSE)
- CSoundFile::gdwSoundSetup |= SNDMIX_REVERSESTEREO;
- else
- CSoundFile::gdwSoundSetup &= ~SNDMIX_REVERSESTEREO;
}
return TRUE;
}
Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h 2013-04-03 13:25:13 UTC (rev 1718)
+++ trunk/OpenMPT/mptrack/Mainfrm.h 2013-04-03 14:51:10 UTC (rev 1719)
@@ -19,7 +19,6 @@
#include "soundlib/snddev.h"
class CInputHandler;
-class CMainFrame;
class CModDoc;
class CAutoSaver;
class ISoundDevice;
@@ -112,7 +111,6 @@
#define SOUNDSETUP_ENABLEMMX 0x08
#define SOUNDSETUP_SOFTPANNING 0x10
-#define SOUNDSETUP_STREVERSE 0x20
#define SOUNDSETUP_SECONDARY 0x40
#define SOUNDSETUP_RESTARTMASK SOUNDSETUP_SECONDARY
@@ -344,7 +342,6 @@
protected:
- CSoundFile m_WaveFile;
CModTreeBar m_wndTree;
CStatusBar m_wndStatusBar;
CMainToolBar m_wndToolBar;
@@ -355,7 +352,10 @@
CSoundFile::samplecount_t m_dwTimeSec;
UINT_PTR m_nTimer;
UINT m_nAvgMixChn, m_nMixChn;
- CHAR m_szUserText[512], m_szInfoText[512], m_szXInfoText[512]; //rewbs.xinfo
+ // Misc
+ CModDoc* m_pJustModifiedDoc;
+ class COptionsSoundcard *m_SoundCardOptionsDialog;
+ bool m_bOptionsLocked;
// Notification Buffer
Util::mutex m_NotificationBufferMutex; // to avoid deadlocks, this mutex should only be taken as a innermost lock, i.e. do not block on anything while holding this mutex
@@ -364,11 +364,11 @@
HANDLE m_PendingNotificationSempahore; // protects the one notification that is in flight from the notification thread to the gui thread from being freed while the gui thread still uses it
MPTNOTIFICATION m_PendingNotification;
- // Misc
- bool m_bOptionsLocked; //rewbs.customKeys
- class COptionsSoundcard * m_SoundCardOptionsDialog;
- CModDoc* m_pJustModifiedDoc;
+ // Instrument preview in tree view
+ CSoundFile m_WaveFile;
+ CHAR m_szUserText[512], m_szInfoText[512], m_szXInfoText[512]; //rewbs.xinfo
+
public:
CMainFrame(/*CString regKeyExtension*/);
void Initialize();
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2013-04-03 13:25:13 UTC (rev 1718)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2013-04-03 14:51:10 UTC (rev 1719)
@@ -123,7 +123,6 @@
CHAR s[128];
CPropertyPage::OnInitDialog();
- if (m_dwSoundSetup & SOUNDSETUP_STREVERSE) CheckDlgButton(IDC_CHECK1, MF_CHECKED);
if (m_dwSoundSetup & SOUNDSETUP_SOFTPANNING) CheckDlgButton(IDC_CHECK2, MF_CHECKED);
if (m_dwSoundSetup & SOUNDSETUP_ENABLEMMX) CheckDlgButton(IDC_CHECK3, MF_CHECKED);
if (m_dwSoundSetup & SOUNDSETUP_SECONDARY) CheckDlgButton(IDC_CHECK4, MF_CHECKED);
@@ -411,8 +410,7 @@
void COptionsSoundcard::OnOK()
//----------------------------
{
- m_dwSoundSetup &= ~(SOUNDSETUP_ENABLEMMX | SOUNDSETUP_SECONDARY | SOUNDSETUP_STREVERSE | SOUNDSETUP_SOFTPANNING);
- if (IsDlgButtonChecked(IDC_CHECK1)) m_dwSoundSetup |= SOUNDSETUP_STREVERSE;
+ m_dwSoundSetup &= ~(SOUNDSETUP_ENABLEMMX | SOUNDSETUP_SECONDARY | SOUNDSETUP_SOFTPANNING);
if (IsDlgButtonChecked(IDC_CHECK2)) m_dwSoundSetup |= SOUNDSETUP_SOFTPANNING;
if (IsDlgButtonChecked(IDC_CHECK3)) m_dwSoundSetup |= SOUNDSETUP_ENABLEMMX;
if (IsDlgButtonChecked(IDC_CHECK4)) m_dwSoundSetup |= SOUNDSETUP_SECONDARY;
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2013-04-03 13:25:13 UTC (rev 1718)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2013-04-03 14:51:10 UTC (rev 1719)
@@ -100,6 +100,7 @@
recordQuantizeRows = 0;
rowDisplayOffset = 0;
+ // Sample Editor
m_nSampleUndoMaxBuffer = 0; // Real sample buffer undo size will be set later.
GetDefaultColourScheme(rgbCustomColors);
@@ -318,6 +319,8 @@
#endif // NO_ASIO
m_nWaveDevice = CMainFrame::GetPrivateProfileLong("Sound Settings", "WaveDevice", defaultDevice, iniFile);
m_dwSoundSetup = CMainFrame::GetPrivateProfileDWord("Sound Settings", "SoundSetup", m_dwSoundSetup, iniFile);
+ if(vIniVersion < MAKE_VERSION_NUMERIC(1, 21, 01, 26))
+ m_dwSoundSetup &= ~0x20; // Reverse stereo
m_dwQuality = CMainFrame::GetPrivateProfileDWord("Sound Settings", "Quality", m_dwQuality, iniFile);
m_nSrcMode = CMainFrame::GetPrivateProfileDWord("Sound Settings", "SrcMode", m_nSrcMode, iniFile);
m_dwRate = CMainFrame::GetPrivateProfileDWord("Sound Settings", "Mixing_Rate", 0, iniFile);
@@ -580,7 +583,7 @@
if (RegOpenKeyEx(HKEY_CURRENT_USER, m_csRegKey, 0, KEY_READ, &key) == ERROR_SUCCESS)
{
RegQueryValueEx(key, "SoundSetup", NULL, &dwREG_DWORD, (LPBYTE)&m_dwSoundSetup, &dwDWORDSize);
- RegQueryValueEx(key, "WaveDevice", NULL, &dwREG_DWORD, (LPBYTE)&m_nWaveDevice, &dwDWORDSize);
+ m_dwSoundSetup &= ~0x20; // Reverse stereo
RegQueryValueEx(key, "Quality", NULL, &dwREG_DWORD, (LPBYTE)&m_dwQuality, &dwDWORDSize);
RegQueryValueEx(key, "SrcMode", NULL, &dwREG_DWORD, (LPBYTE)&m_nSrcMode, &dwDWORDSize);
RegQueryValueEx(key, "Mixing_Rate", NULL, &dwREG_DWORD, (LPBYTE)&m_dwRate, &dwDWORDSize);
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2013-04-03 13:25:13 UTC (rev 1718)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2013-04-03 14:51:10 UTC (rev 1719)
@@ -1286,9 +1286,8 @@
COMBOBOX IDC_COMBO5,156,84,72,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Max. Polyphony:",IDC_STATIC,12,102,57,12,SS_CENTERIMAGE
COMBOBOX IDC_COMBO4,78,102,72,88,CBS_DROPDOWNLIST | WS_TABSTOP
- CONTROL "Soft Panning",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,138,64,12
- CONTROL "Reverse Stereo",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,84,138,62,12
- CONTROL "Enable MMX Acceleration",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,138,102,12
+ CONTROL "Soft Panning",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,138,78,12
+ CONTROL "Enable MMX Acceleration",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,96,138,156,12
LTEXT "Stereo Separation:",IDC_STATIC,12,157,62,8
LTEXT "100%",IDC_TEXT1,80,157,20,8
RTEXT "Low",IDC_STATIC,22,168,15,14,SS_CENTERIMAGE
Modified: trunk/OpenMPT/soundlib/Snd_defs.h
===================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h 2013-04-03 13:25:13 UTC (rev 1718)
+++ trunk/OpenMPT/soundlib/Snd_defs.h 2013-04-03 14:51:10 UTC (rev 1719)
@@ -272,7 +272,6 @@
#define SONG_PLAY_FLAGS (~SONG_FILE_FLAGS)
// Global Options (Renderer)
-#define SNDMIX_REVERSESTEREO 0x0001 // swap L/R audio channels
#ifndef NO_DSP
#define SNDMIX_NOISEREDUCTION 0x0002 // reduce hiss (do not use, it's just a simple low-pass filter)
#endif // NO_DSP
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2013-04-03 13:25:13 UTC (rev 1718)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2013-04-03 14:51:10 UTC (rev 1719)
@@ -1975,7 +1975,6 @@
pan /= 128;
pan += 128;
Limit(pan, 0, 256);
- if (gdwSoundSetup & SNDMIX_REVERSESTEREO) pan = 256 - pan;
LONG realvol;
if (m_pConfig->getUseGlobalPreAmp())
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
