Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1002] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2011-08-31 17:51:53
|
Revision: 1002
http://modplug.svn.sourceforge.net/modplug/?rev=1002&view=rev
Author: saga-games
Date: 2011-08-31 17:51:46 +0000 (Wed, 31 Aug 2011)
Log Message:
-----------
[Fix] Tentative fix for disappearing combo boxes
[Mod] Disabled DEP in VS2010 builds again (breaks Farbrausch V2)
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_gen.cpp
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/resource.h
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2011-08-25 21:22:28 UTC (rev 1001)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2011-08-31 17:51:46 UTC (rev 1002)
@@ -154,6 +154,9 @@
CMainFrame::EnableLowLatencyMode(FALSE);
PostViewMessage(VIEWMSG_SETACTIVE, NULL);
SetFocus();
+
+ // Combo boxes randomly disappear without this... why?
+ Invalidate();
}
@@ -403,10 +406,12 @@
if ((m_pSndFile) && (m_pModDoc) && (m_bInitialized))
{
m_EditVSTiVol.GetWindowText(s, sizeof(s));
- if (s[0]) {
+ if (s[0])
+ {
UINT n = ConvertStrTo<UINT>(s);
- n = CLAMP(n, 0, 2000);
- if (n != m_pSndFile->m_nVSTiVolume) {
+ Limit(n, 0u, 2000u);
+ if (n != m_pSndFile->m_nVSTiVolume)
+ {
m_bEditsLocked=true;
m_pSndFile->m_nVSTiVolume = n;
m_pSndFile->RecalculateGainForAllPlugs();
@@ -426,10 +431,12 @@
if ((m_pSndFile) && (m_pModDoc) && (m_bInitialized))
{
m_EditSamplePA.GetWindowText(s, sizeof(s));
- if (s[0]) {
+ if (s[0])
+ {
UINT n = ConvertStrTo<UINT>(s);
- n = CLAMP(n, 0, 2000);
- if (n != m_pSndFile->m_nSamplePreAmp) {
+ Limit(n, 0u, 2000u);
+ if (n != m_pSndFile->m_nSamplePreAmp)
+ {
m_bEditsLocked=true;
m_pSndFile->m_nSamplePreAmp = n;
m_pModDoc->SetModified();
@@ -451,7 +458,7 @@
if (s[0])
{
UINT n = atoi(s);
- n = CLAMP(n, 0, 128);
+ Limit(n, 0u, 128u);
if (n != (m_pSndFile->m_nDefaultGlobalVolume >> 1))
{
m_bEditsLocked=true;
@@ -478,7 +485,7 @@
if (s[0])
{
ORDERINDEX n = (ORDERINDEX)atoi(s);
- n = CLAMP(n, 0, m_pSndFile->Order.size());
+ Limit(n, (ORDERINDEX)0, m_pSndFile->Order.size());
for (ORDERINDEX i = 0; i <= n; i++)
if (m_pSndFile->Order[i] == m_pSndFile->Order.GetInvalidPatIndex()) return;
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2011-08-25 21:22:28 UTC (rev 1001)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2011-08-31 17:51:46 UTC (rev 1002)
@@ -17,8 +17,6 @@
/////////////////////////////////////////////////////////////////////////
// CNoteMapWnd
-#define ID_NOTEMAP_EDITSAMPLE 40000
-
BEGIN_MESSAGE_MAP(CNoteMapWnd, CStatic)
ON_WM_ERASEBKGND()
ON_WM_PAINT()
@@ -1026,8 +1024,8 @@
if (bUpdNum)
{
SetDlgItemInt(IDC_EDIT_INSTRUMENT, m_nInstrument);
- m_SpinInstrument.SetRange(1, m_pSndFile->m_nInstruments);
- m_SpinInstrument.EnableWindow((m_pSndFile->m_nInstruments) ? TRUE : FALSE);
+ m_SpinInstrument.SetRange(1, m_pSndFile->GetNumInstruments());
+ m_SpinInstrument.EnableWindow((m_pSndFile->GetNumInstruments()) ? TRUE : FALSE);
// Is this a bug ?
m_SliderCutOff.InvalidateRect(NULL, FALSE);
m_SliderResonance.InvalidateRect(NULL, FALSE);
@@ -1073,6 +1071,8 @@
if (pFrame) PostViewMessage(VIEWMSG_LOADSTATE, (LPARAM)pFrame->GetInstrumentViewState());
SwitchToView();
+ // Combo boxes randomly disappear without this... why?
+ Invalidate();
}
@@ -1836,7 +1836,7 @@
int minval = 0, maxval = 32767;
m_SpinFadeOut.GetRange(minval, maxval);
int nVol = GetDlgItemInt(IDC_EDIT7);
- nVol = CLAMP(nVol, minval, maxval);
+ Limit(nVol, minval, maxval);
if(nVol != (int)pIns->nFadeOut)
{
@@ -1854,8 +1854,7 @@
if ((!IsLocked()) && (pIns))
{
int nVol = GetDlgItemInt(IDC_EDIT8);
- if (nVol < 0) nVol = 0;
- if (nVol > 64) nVol = 64;
+ Limit(nVol, 0, 64);
if (nVol != (int)pIns->nGlobalVol)
{
pIns->nGlobalVol = nVol;
@@ -2808,6 +2807,7 @@
m_ComboTuning.SetCurSel(0);
}
+
void CCtrlInstruments::UpdatePluginList()
//---------------------------------------
{
@@ -2817,14 +2817,13 @@
CHAR s[64];
for (PLUGINDEX nPlug = 0; nPlug <= MAX_MIXPLUGINS; nPlug++)
{
- s[0] = 0;
if (!nPlug)
{
strcpy(s, "No plugin");
}
else
{
- PSNDMIXPLUGIN p = &(m_pSndFile->m_MixPlugins[nPlug-1]);
+ PSNDMIXPLUGIN p = &(m_pSndFile->m_MixPlugins[nPlug - 1]);
p->Info.szLibraryName[63] = 0;
if (p->Info.szLibraryName[0])
wsprintf(s, "FX%d: %s", nPlug, p->Info.szName);
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2011-08-25 21:22:28 UTC (rev 1001)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2011-08-31 17:51:46 UTC (rev 1002)
@@ -607,6 +607,9 @@
SwitchToView();
}
+
+ // Combo boxes randomly disappear without this... why?
+ Invalidate();
}
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2011-08-25 21:22:28 UTC (rev 1001)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2011-08-31 17:51:46 UTC (rev 1002)
@@ -404,6 +404,9 @@
CChildFrame *pFrame = (CChildFrame *)GetParentFrame();
if ((pFrame) && (m_hWndView)) PostViewMessage(VIEWMSG_LOADSTATE, (LPARAM)pFrame->GetSampleViewState());
SwitchToView();
+
+ // Combo boxes randomly disappear without this... why?
+ Invalidate();
}
@@ -3113,8 +3116,8 @@
void CCtrlSamples::SetSelectionPoints(UINT nStart, UINT nEnd)
//-----------------------------------------------------------
{
- nStart = CLAMP(nStart, 0, m_pSndFile->Samples[m_nSample].nLength);
- nEnd = CLAMP(nEnd, 0, m_pSndFile->Samples[m_nSample].nLength);
+ Limit(nStart, 0u, m_pSndFile->Samples[m_nSample].nLength);
+ Limit(nEnd, 0u, m_pSndFile->Samples[m_nSample].nLength);
SAMPLEVIEWSTATE viewstate;
MemsetZero(viewstate);
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2011-08-25 21:22:28 UTC (rev 1001)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2011-08-31 17:51:46 UTC (rev 1002)
@@ -158,7 +158,7 @@
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<RandomizedBaseAddress>true</RandomizedBaseAddress>
- <DataExecutionPrevention>true</DataExecutionPrevention>
+ <DataExecutionPrevention>false</DataExecutionPrevention>
</Link>
<Manifest>
<AdditionalManifestFiles>$(ProjectDir)res/rt_manif.bin;%(AdditionalManifestFiles)</AdditionalManifestFiles>
Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h 2011-08-25 21:22:28 UTC (rev 1001)
+++ trunk/OpenMPT/mptrack/resource.h 2011-08-31 17:51:46 UTC (rev 1002)
@@ -1098,8 +1098,6 @@
#define ID_PLUGSELECT 35000
#define ID_VSTMACRO_INFO 36002
#define ID_VSTINPUT_INFO 36003
-#define ID_PLAYER_APPROXI 36004
-#define ID_Menu36005 36005
#define ID_APPROX_BPM 36007
#define ID_FACTORY_MENU 36008
#define ID_PLUG_BYPASS 36009
@@ -1131,68 +1129,73 @@
#define ID_PLUG_PASSKEYS 38001
#define ID_VIEW_SONGPROPERTIES 38002
#define ID_SEQUENCE_ITEM 38003
-#define ID_GROW_SELECTION 40001
-#define ID_SHRINK_SELECTION 40002
-#define ID_RUN_SCRIPT 40003
-#define ID_EXAMPLE_MODULES 40004
-#define ID_EXAMPLE_MODULES_LASTINRANGE 40053
-#define ID_FILE_OPENTEMPLATE 40054
-#define ID_FILE_OPENTEMPLATE_LASTINRANGE 40103
-#define ID_INDICATOR_TIME 40143
-#define ID_INDICATOR_USER 40144
-#define ID_INDICATOR_INFO 40145
-#define ID_FILE_SAVECOMPAT 40146
-#define ID_INDICATOR_XINFO 40147
-#define ID_PATTERN_ADDCHANNEL_FRONT 40148
-#define ID_PATTERN_ADDCHANNEL_AFTER 40149
-#define ID_PATTERN_REMOVECHANNEL 40150
-#define ID_PATTERN_REMOVECHANNELDIALOG 40151
-#define ID_NEW_MPT 40152
-#define ID_CLEANUP_PLUGS 40153
-#define ID_ENVELOPE_TOGGLERELEASENODE 40154
-#define ID_ENVELOPE_SCALEPOINTS 40155
-#define ID_VIEW_MIDIMAPPING 40156
-#define ID_PATTERN_DUPLICATECHANNEL 40216
-#define ID_EDIT_GOTO_MENU 40217
-#define ID_CLEANUP_COMPO 40218
-#define ID_SAMPLE_DRAW 40219
-#define ID_SAMPLE_ADDSILENCE 40220
-#define ID_OVERFLOWPASTE 40221
-#define ID_NOTEMAP_COPY_NOTE 40222
-#define ID_CLEANUP_REARRANGESAMPLES 40223
-#define ID_ORDERLIST_RENDER 40224
-#define ID_EDIT_CLEANUP 40225
-#define ID_ORDERLIST_EDIT_COPY 40226
-#define ID_ORDERLIST_EDIT_CUT 40227
-#define ID_ORDERLIST_EDIT_PASTE 40228
-#define ID_CHANNEL_RENAME 40229
-#define ID_EDIT_PASTEFLOOD 40230
-#define ID_MODTREE_DUPLICATE 40231
-#define ID_MODTREE_INSERT 40232
-#define ID_MODTREE_SWITCHTO 40233
-#define ID_EDIT_PUSHFORWARDPASTE 40234
-#define ID_EDIT_SPLITKEYBOARDSETTINGS 40235
-#define ID_EDIT_PASTESPECIAL 40236
-#define ID_CHANGE_PCNOTE_PARAM 40242
-#define ID_MODTREE_CLOSE 41243
-#define ID_SAMPLE_GENERATOR_MENU 41244
-#define ID_SAMPLE_GENERATOR_PRESET_MENU 41344
-#define ID_SAMPLE_GENERATE 41445
-#define ID_NOTEMAP_TRANS_UP 41446
-#define ID_NOTEMAP_TRANS_DOWN 41447
-#define ID_PATTERN_EDIT_PCNOTE_PLUGIN 41448
-#define ID_ENVELOPE_ZOOM_IN 41449
-#define ID_ENVELOPE_ZOOM_OUT 41450
-#define ID_PANIC 41451
-#define ID_VIEW_EDITHISTORY 41452
-#define ID_SAMPLE_GRID 41453
-#define ID_SAMPLE_QUICKFADE 41454
-#define ID_EDIT_MIXPASTE_ITSTYLE 41455
-#define ID_VIEW_MPTHACKS 41456
-#define ID_PLUGINTOINSTRUMENT 41457
-#define ID_INTERNETUPDATE 41458
-#define ID_HELP_EXAMPLEMODULES 41459
-#define ID_FILE_SAVEASTEMPLATE 41460
+// From here: Command range [ID_SEQUENCE_ITEM, ID_SEQUENCE_ITEM + MAX_SEQUENCES + 2]
+#define ID_NOTEMAP_EDITSAMPLE 39000
+// From here: Command range [ID_NOTEMAP_EDITSAMPLE, ID_NOTEMAP_EDITSAMPLE + MAX_SAMPLES]
+#define ID_GROW_SELECTION 43001
+#define ID_SHRINK_SELECTION 43002
+#define ID_RUN_SCRIPT 43003
+#define ID_EXAMPLE_MODULES 43004
+#define ID_EXAMPLE_MODULES_LASTINRANGE 43053
+#define ID_FILE_OPENTEMPLATE 43054
+#define ID_FILE_OPENTEMPLATE_LASTINRANGE 43103
+#define ID_INDICATOR_TIME 43143
+#define ID_INDICATOR_USER 43144
+#define ID_INDICATOR_INFO 43145
+#define ID_FILE_SAVECOMPAT 43146
+#define ID_INDICATOR_XINFO 43147
+#define ID_PATTERN_ADDCHANNEL_FRONT 43148
+#define ID_PATTERN_ADDCHANNEL_AFTER 43149
+#define ID_PATTERN_REMOVECHANNEL 43150
+#define ID_PATTERN_REMOVECHANNELDIALOG 43151
+#define ID_NEW_MPT 43152
+#define ID_CLEANUP_PLUGS 43153
+#define ID_ENVELOPE_TOGGLERELEASENODE 43154
+#define ID_ENVELOPE_SCALEPOINTS 43155
+#define ID_VIEW_MIDIMAPPING 43156
+#define ID_PATTERN_DUPLICATECHANNEL 43216
+#define ID_EDIT_GOTO_MENU 43217
+#define ID_CLEANUP_COMPO 43218
+#define ID_SAMPLE_DRAW 43219
+#define ID_SAMPLE_ADDSILENCE 43220
+#define ID_OVERFLOWPASTE 43221
+#define ID_NOTEMAP_COPY_NOTE 43222
+#define ID_CLEANUP_REARRANGESAMPLES 43223
+#define ID_ORDERLIST_RENDER 43224
+#define ID_EDIT_CLEANUP 43225
+#define ID_ORDERLIST_EDIT_COPY 43226
+#define ID_ORDERLIST_EDIT_CUT 43227
+#define ID_ORDERLIST_EDIT_PASTE 43228
+#define ID_CHANNEL_RENAME 43229
+#define ID_EDIT_PASTEFLOOD 43230
+#define ID_MODTREE_DUPLICATE 43231
+#define ID_MODTREE_INSERT 43232
+#define ID_MODTREE_SWITCHTO 43233
+#define ID_EDIT_PUSHFORWARDPASTE 43234
+#define ID_EDIT_SPLITKEYBOARDSETTINGS 43235
+#define ID_EDIT_PASTESPECIAL 43236
+#define ID_CHANGE_PCNOTE_PARAM 43242
+// From here: Command range [ID_CHANGE_PCNOTE_PARAM, ID_CHANGE_PCNOTE_PARAM + MODCOMMAND::maxColumnValue]
+#define ID_MODTREE_CLOSE 44243
+#define ID_SAMPLE_GENERATOR_MENU 44244
+#define ID_SAMPLE_GENERATOR_PRESET_MENU 44344
+// From here: Command range [ID_SAMPLE_GENERATOR_PRESET_MENU, ID_SAMPLE_GENERATOR_PRESET_MENU + MAX_SAMPLEGEN_EXPRESSIONS - 1]
+#define ID_SAMPLE_GENERATE 44445
+#define ID_NOTEMAP_TRANS_UP 44446
+#define ID_NOTEMAP_TRANS_DOWN 44447
+#define ID_PATTERN_EDIT_PCNOTE_PLUGIN 44448
+#define ID_ENVELOPE_ZOOM_IN 44449
+#define ID_ENVELOPE_ZOOM_OUT 44450
+#define ID_PANIC 44451
+#define ID_VIEW_EDITHISTORY 44452
+#define ID_SAMPLE_GRID 44453
+#define ID_SAMPLE_QUICKFADE 44454
+#define ID_EDIT_MIXPASTE_ITSTYLE 44455
+#define ID_VIEW_MPTHACKS 44456
+#define ID_PLUGINTOINSTRUMENT 44457
+#define ID_INTERNETUPDATE 44458
+#define ID_HELP_EXAMPLEMODULES 44459
+#define ID_FILE_SAVEASTEMPLATE 44460
// Next default values for new objects
//
@@ -1200,7 +1203,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
#define _APS_NEXT_RESOURCE_VALUE 531
-#define _APS_NEXT_COMMAND_VALUE 40461
+#define _APS_NEXT_COMMAND_VALUE 44461
#define _APS_NEXT_CONTROL_VALUE 2436
#define _APS_NEXT_SYMED_VALUE 901
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
