Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[3872] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2014-03-11 20:21:49
|
Revision: 3872
http://sourceforge.net/p/modplug/code/3872
Author: saga-games
Date: 2014-03-11 20:21:41 +0000 (Tue, 11 Mar 2014)
Log Message:
-----------
[Fix] Allow building with NO_EQ and NO_VST again.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mod2wave.cpp
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/Mpdlgs.h
trunk/OpenMPT/mptrack/TrackerSettings.cpp
trunk/OpenMPT/mptrack/Vstplug.h
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2014-03-11 17:52:03 UTC (rev 3871)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2014-03-11 20:21:41 UTC (rev 3872)
@@ -1861,8 +1861,8 @@
dlg.AddPage(&sounddlg);
dlg.AddPage(&mixerdlg);
#if !defined(NO_REVERB) || !defined(NO_DSP) || !defined(NO_EQ) || !defined(NO_AGC) || !defined(NO_EQ)
- COptionsPlayer playerdlg(TrackerSettings::Instance().m_EqSettings);
- dlg.AddPage(&playerdlg);
+ COptionsPlayer dspdlg;
+ dlg.AddPage(&dspdlg);
#endif
dlg.AddPage(&smpeditor);
dlg.AddPage(&keyboard);
Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp 2014-03-11 17:52:03 UTC (rev 3871)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp 2014-03-11 20:21:41 UTC (rev 3872)
@@ -646,7 +646,7 @@
COptionsMixer mixerpage;
dlg.AddPage(&mixerpage);
#if !defined(NO_REVERB) || !defined(NO_DSP) || !defined(NO_EQ) || !defined(NO_AGC) || !defined(NO_EQ)
- COptionsPlayer dsppage(TrackerSettings::Instance().m_EqSettings);
+ COptionsPlayer dsppage;
dlg.AddPage(&dsppage);
#endif
dlg.DoModal();
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2014-03-11 17:52:03 UTC (rev 3871)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2014-03-11 20:21:41 UTC (rev 3872)
@@ -596,6 +596,7 @@
CVstPlugin *srcVstPlug = static_cast<CVstPlugin *>(source.pMixPlugin);
target.Destroy();
MemCopy(target.Info, source.Info);
+#ifndef NO_VST
if(theApp.GetPluginManager()->CreateMixPlugin(target, GetrSoundFile()))
{
CVstPlugin *newVstPlug = static_cast<CVstPlugin *>(target.pMixPlugin);
@@ -609,6 +610,7 @@
VSTPresets::LoadFile(file, *newVstPlug);
}
}
+#endif // !NO_VST
}
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-03-11 17:52:03 UTC (rev 3871)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2014-03-11 20:21:41 UTC (rev 3872)
@@ -1034,6 +1034,8 @@
// CEQSavePresetDlg
//
+#ifndef NO_EQ
+
//====================================
class CEQSavePresetDlg: public CDialog
//====================================
@@ -1105,11 +1107,14 @@
return CSliderCtrl::PreTranslateMessage(pMsg);
}
+#endif // !NO_EQ
+
//////////////////////////////////////////////////////////
// COptionsPlayer - DSP / EQ settings
+#ifndef NO_EQ
#define EQ_MAX_FREQS 5
const UINT gEqBandFreqs[MAX_EQ_BANDS][EQ_MAX_FREQS] =
@@ -1121,8 +1126,10 @@
{ 3000, 3500, 4000, 4500, 5000 },
{ 6000, 7000, 8000, 9000, 10000 },
};
+#endif // !NO_EQ
BEGIN_MESSAGE_MAP(COptionsPlayer, CPropertyPage)
+#ifndef NO_EQ
// EQ
ON_WM_VSCROLL()
ON_COMMAND(IDC_BUTTON1, OnEqUser1)
@@ -1130,8 +1137,9 @@
ON_COMMAND(IDC_BUTTON3, OnEqUser3)
ON_COMMAND(IDC_BUTTON4, OnEqUser4)
ON_COMMAND(IDC_BUTTON5, OnSavePreset)
- ON_COMMAND_RANGE(ID_EQSLIDER_BASE, ID_EQSLIDER_BASE+MAX_EQ_BANDS, OnSliderMenu)
- ON_COMMAND_RANGE(ID_EQMENU_BASE, ID_EQMENU_BASE+EQ_MAX_FREQS, OnSliderFreq)
+ ON_COMMAND_RANGE(ID_EQSLIDER_BASE, ID_EQSLIDER_BASE + MAX_EQ_BANDS, OnSliderMenu)
+ ON_COMMAND_RANGE(ID_EQMENU_BASE, ID_EQMENU_BASE + EQ_MAX_FREQS, OnSliderFreq)
+#endif // !NO_EQ
// DSP
ON_WM_HSCROLL()
@@ -1172,6 +1180,8 @@
m_Sliders[i].SetRange(0, 32);
m_Sliders[i].SetTicFreq(4);
}
+
+ UpdateDialog();
#endif
DWORD dwQuality = TrackerSettings::Instance().MixerDSPMask;
@@ -1257,7 +1267,6 @@
m_SbSurroundDelay.ShowWindow(SW_HIDE);
#endif
- UpdateDialog();
return TRUE;
}
@@ -1363,14 +1372,14 @@
}
+#ifndef NO_EQ
+
void COptionsPlayer::UpdateEQ(bool bReset)
//----------------------------------------
{
-#ifndef NO_EQ
CriticalSection cs;
if(CMainFrame::GetMainFrame()->GetSoundFilePlaying())
CMainFrame::GetMainFrame()->GetSoundFilePlaying()->SetEQGains(m_EQPreset.Gains, MAX_EQ_BANDS, m_EQPreset.Freqs, bReset);
-#endif
}
@@ -1490,7 +1499,9 @@
}
}
+#endif // !NO_EQ
+
/////////////////////////////////////////////////////////////
// CMidiSetupDlg
Modified: trunk/OpenMPT/mptrack/Mpdlgs.h
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.h 2014-03-11 17:52:03 UTC (rev 3871)
+++ trunk/OpenMPT/mptrack/Mpdlgs.h 2014-03-11 20:21:41 UTC (rev 3872)
@@ -122,6 +122,8 @@
};
+#ifndef NO_EQ
+
//=================================
class CEQSlider: public CSliderCtrl
//=================================
@@ -132,11 +134,13 @@
short int m_x, m_y;
public:
CEQSlider() {}
- VOID Init(UINT nID, UINT n, CWnd *parent);
+ void Init(UINT nID, UINT n, CWnd *parent);
BOOL PreTranslateMessage(MSG *pMsg);
};
+#endif // !NO_EQ
+
//========================================
class COptionsPlayer: public CPropertyPage
//========================================
@@ -147,12 +151,18 @@
CSliderCtrl m_SbSurroundDepth, m_SbSurroundDelay;
CSliderCtrl m_SbReverbDepth;
+#ifndef NO_EQ
CEQSlider m_Sliders[MAX_EQ_BANDS];
EQPreset &m_EQPreset;
UINT m_nSliderMenu;
+#endif // !NO_EQ
public:
- COptionsPlayer(EQPreset &eqPreset) : CPropertyPage(IDD_OPTIONS_PLAYER), m_EQPreset(eqPreset) {}
+ COptionsPlayer() : CPropertyPage(IDD_OPTIONS_PLAYER)
+#ifndef NO_EQ
+ , m_EQPreset(TrackerSettings::Instance().m_EqSettings)
+#endif
+ { }
protected:
virtual BOOL OnInitDialog();
@@ -162,6 +172,7 @@
afx_msg void OnHScroll(UINT, UINT, CScrollBar *);
afx_msg void OnSettingsChanged() { SetModified(TRUE); }
+#ifndef NO_EQ
afx_msg void OnVScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
afx_msg void OnEqUser1() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[0]); };
afx_msg void OnEqUser2() { LoadEQPreset(TrackerSettings::Instance().m_EqUserPresets[1]); };
@@ -174,6 +185,7 @@
void UpdateDialog();
void UpdateEQ(bool bReset);
void LoadEQPreset(const EQPreset &preset);
+#endif // !NO_EQ
DECLARE_MESSAGE_MAP()
};
Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp 2014-03-11 17:52:03 UTC (rev 3871)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp 2014-03-11 20:21:41 UTC (rev 3872)
@@ -508,11 +508,13 @@
}
// Effects
+#ifndef NO_EQ
FixupEQ(&m_EqSettings);
FixupEQ(&m_EqUserPresets[0]);
FixupEQ(&m_EqUserPresets[1]);
FixupEQ(&m_EqUserPresets[2]);
FixupEQ(&m_EqUserPresets[3]);
+#endif // !NO_EQ
// Zxx Macros
if((MAKE_VERSION_NUMERIC(1,17,00,00) <= storedVersion) && (storedVersion < MAKE_VERSION_NUMERIC(1,20,00,00)))
Modified: trunk/OpenMPT/mptrack/Vstplug.h
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.h 2014-03-11 17:52:03 UTC (rev 3871)
+++ trunk/OpenMPT/mptrack/Vstplug.h 2014-03-11 20:21:41 UTC (rev 3872)
@@ -292,7 +292,7 @@
VstInt32 GetUID() const { return 0; }
VstInt32 GetVersion() const { return 0; }
- bool CanAutomateParameter(PlugParamIndex index) { return false; }
+ bool CanAutomateParameter(PlugParamIndex) { return false; }
CString GetFormattedParamName(PlugParamIndex) { return ""; };
CString GetFormattedParamValue(PlugParamIndex){ return ""; };
@@ -365,7 +365,7 @@
const VSTPluginLib **begin() const { return nullptr; }
const VSTPluginLib **end() const { return nullptr; }
- void reserve(size_t num) { }
+ void reserve(size_t) { }
void OnIdle() {}
#endif // NO_VST
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2014-03-11 17:52:03 UTC (rev 3871)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2014-03-11 20:21:41 UTC (rev 3872)
@@ -474,7 +474,7 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
GROUPBOX "",IDC_STATIC,6,6,276,150
- CONTROL "Enable Graphic Equalizer",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,6,96,10
+ CONTROL "&Enable Graphic Equalizer",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,6,94,10
LTEXT "+12dB",IDC_STATIC,12,21,22,8
LTEXT "+0dB",IDC_STATIC,16,49,18,8
LTEXT "-12dB",IDC_STATIC,14,74,20,8
@@ -495,11 +495,11 @@
PUSHBUTTON "User2",IDC_BUTTON2,240,36,36,12
PUSHBUTTON "User3",IDC_BUTTON3,240,54,36,12
PUSHBUTTON "User4",IDC_BUTTON4,240,72,36,12
- PUSHBUTTON "Save...",IDC_BUTTON5,240,90,36,12
+ PUSHBUTTON "&Save...",IDC_BUTTON5,240,90,36,12
LTEXT "EQ Warning Message",IDC_EQ_WARNING,12,114,264,36,0,WS_EX_TRANSPARENT
GROUPBOX "",IDC_STATIC,6,156,276,120
- CONTROL "Automatic Gain Control",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,164,97,10
- CONTROL "Bass Expansion",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,178,81,10
+ CONTROL "&Automatic Gain Control",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,164,97,10
+ CONTROL "&Bass Expansion",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,178,81,10
CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,191,62,15
LTEXT "Low",IDC_STATIC,17,193,14,8
LTEXT "High",IDC_STATIC,95,193,16,8
@@ -507,13 +507,13 @@
CONTROL "Slider2",IDC_SLIDER2,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,149,190,62,15
LTEXT "10Hz",IDC_STATIC,131,193,18,8
LTEXT "100Hz",IDC_STATIC,211,191,23,8
- CONTROL "Reverb",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,210,62,10
+ CONTROL "&Reverb",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,210,62,10
CONTROL "Slider1",IDC_SLIDER3,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,222,62,15
LTEXT "Low",IDC_STATIC,17,226,14,8
LTEXT "High",IDC_STATIC,95,226,16,8
CTEXT "Reverb Preset:",IDC_STATIC,150,210,62,8
COMBOBOX IDC_COMBO2,135,223,100,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
- CONTROL "Pro-Logic Surround",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,242,99,10
+ CONTROL "&Pro-Logic Surround",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,242,99,10
CONTROL "Slider1",IDC_SLIDER5,"msctls_trackbar32",TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,33,255,62,15
LTEXT "Low",IDC_STATIC,17,258,14,8
LTEXT "High",IDC_STATIC,95,258,16,8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
