Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[830] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2011-03-26 13:07:50
|
Revision: 830
http://modplug.svn.sourceforge.net/modplug/?rev=830&view=rev
Author: saga-games
Date: 2011-03-26 13:07:43 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
[Fix] Sample Editor: Loop point controls also accept large numbers to be inputted manually.
[Fix] Instrument Editor: Fadeout control also accepts large numbers to be inputted manually.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/Ctrl_ins.h
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/mptrack/version.h
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2011-03-25 18:36:23 UTC (rev 829)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2011-03-26 13:07:43 UTC (rev 830)
@@ -825,6 +825,7 @@
DDX_Control(pDX, IDC_COMBO6, m_CbnMixPlug); //rewbs.instroVSTi
DDX_Control(pDX, IDC_COMBO9, m_CbnResampling);
DDX_Control(pDX, IDC_FILTERMODE, m_CbnFilterMode);
+ DDX_Control(pDX, IDC_EDIT7, m_EditFadeOut);
DDX_Control(pDX, IDC_SPIN7, m_SpinFadeOut);
DDX_Control(pDX, IDC_SPIN8, m_SpinGlobalVol);
DDX_Control(pDX, IDC_SPIN9, m_SpinPanning);
@@ -1163,10 +1164,10 @@
m_EditName.SetLimitText(specs->instrNameLengthMax);
m_EditFileName.SetLimitText(specs->instrFilenameLengthMax);
- BOOL bITandMPT = ((m_pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) && (m_pSndFile->m_nInstruments)) ? TRUE : FALSE;
+ const BOOL bITandMPT = ((m_pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) && (m_pSndFile->m_nInstruments)) ? TRUE : FALSE;
//rewbs.instroVSTi
- BOOL bITandXM = ((m_pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_XM)) && (m_pSndFile->m_nInstruments)) ? TRUE : FALSE;
- bool bMPTOnly = ((m_pSndFile->m_nType == MOD_TYPE_MPT) && (m_pSndFile->m_nInstruments)) ? TRUE : FALSE;
+ const BOOL bITandXM = ((m_pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT | MOD_TYPE_XM)) && (m_pSndFile->m_nInstruments)) ? TRUE : FALSE;
+ const BOOL bMPTOnly = ((m_pSndFile->m_nType == MOD_TYPE_MPT) && (m_pSndFile->m_nInstruments)) ? TRUE : FALSE;
::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT10), bITandXM);
::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT11), bITandXM);
::EnableWindow(::GetDlgItem(m_hWnd, IDC_EDIT7), bITandXM);
@@ -1180,11 +1181,10 @@
m_SpinMidiBK.EnableWindow(bITandXM); //rewbs.MidiBank
//end rewbs.instroVSTi
+ const bool extendedFadeoutRange = (m_pSndFile->m_nType & MOD_TYPE_XM) != 0;
m_SpinFadeOut.EnableWindow(bITandXM);
- if(m_pSndFile->m_nType & MOD_TYPE_XM)
- m_SpinFadeOut.SetRange(0, 32767);
- else
- m_SpinFadeOut.SetRange(0, 8192);
+ m_SpinFadeOut.SetRange(0, extendedFadeoutRange ? 32767 : 8192);
+ m_EditFadeOut.SetLimitText(extendedFadeoutRange ? 5 : 4);
// Panning ranges (0...64 for IT, 0...256 for MPTM)
m_SpinPanning.SetRange(0, (m_pModDoc->GetModType() & MOD_TYPE_IT) ? 64 : 256);
@@ -1551,7 +1551,7 @@
{
m_CbnPluginVelocityHandling.EnableWindow(FALSE);
m_CbnPluginVolumeHandling.EnableWindow(FALSE);
- wsprintf(pszText, "To enable, clear plugin volume command bug emulation flag from song properties");
+ wsprintf(pszText, "To enable, clear Plugin volume command bug emulation flag from Song Properties");
return TRUE;
}
else
@@ -1825,8 +1825,10 @@
MODINSTRUMENT *pIns = m_pSndFile->Instruments[m_nInstrument];
if ((!IsLocked()) && (pIns))
{
+ int minval = 0, maxval = 32767;
+ m_SpinFadeOut.GetRange(minval, maxval);
int nVol = GetDlgItemInt(IDC_EDIT7);
- nVol = CLAMP(nVol, 0, 32767);
+ nVol = CLAMP(nVol, minval, maxval);
if(nVol != (int)pIns->nFadeOut)
{
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.h 2011-03-25 18:36:23 UTC (rev 829)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.h 2011-03-26 13:07:43 UTC (rev 830)
@@ -83,7 +83,7 @@
CSpinButtonCtrl m_SpinInstrument, m_SpinFadeOut, m_SpinGlobalVol, m_SpinPanning;
CSpinButtonCtrl m_SpinMidiPR, m_SpinPPS, m_SpinMidiBK;
CComboBox m_ComboNNA, m_ComboDCT, m_ComboDCA, m_ComboPPC, m_CbnMidiCh, m_CbnMixPlug, m_CbnResampling, m_CbnFilterMode, m_CbnPluginVelocityHandling, m_CbnPluginVolumeHandling;
- CEdit m_EditName, m_EditFileName, m_EditGlobalVol, m_EditPanning, m_EditPPS;
+ CEdit m_EditName, m_EditFileName, m_EditGlobalVol, m_EditPanning, m_EditPPS, m_EditFadeOut;
CButton m_CheckPanning, m_CheckCutOff, m_CheckResonance;
CSliderCtrl m_SliderVolSwing, m_SliderPanSwing, m_SliderCutSwing, m_SliderResSwing,
m_SliderCutOff, m_SliderResonance;
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2011-03-25 18:36:23 UTC (rev 829)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2011-03-26 13:07:43 UTC (rev 830)
@@ -614,14 +614,14 @@
EDITTEXT IDC_SAMPLE_NAME,129,26,135,12,ES_AUTOHSCROLL
EDITTEXT IDC_SAMPLE_FILENAME,292,26,72,13,ES_AUTOHSCROLL
COMBOBOX IDC_COMBO1,130,54,45,46,CBS_DROPDOWNLIST | WS_TABSTOP
- EDITTEXT IDC_EDIT1,130,70,45,12,ES_NUMBER
+ EDITTEXT IDC_EDIT1,130,70,45,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,169,69,11,11
- EDITTEXT IDC_EDIT2,130,83,45,12,ES_NUMBER
+ EDITTEXT IDC_EDIT2,130,83,45,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Spin1",IDC_SPIN2,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,169,84,11,11
COMBOBOX IDC_COMBO2,212,54,45,46,CBS_DROPDOWNLIST | WS_TABSTOP
- EDITTEXT IDC_EDIT3,212,70,45,12,ES_NUMBER
+ EDITTEXT IDC_EDIT3,212,70,45,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Spin1",IDC_SPIN3,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,253,70,11,11
- EDITTEXT IDC_EDIT4,212,83,45,12,ES_NUMBER
+ EDITTEXT IDC_EDIT4,212,83,45,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Spin1",IDC_SPIN4,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,253,83,11,11
COMBOBOX IDC_COMBO3,275,59,47,70,CBS_DROPDOWNLIST | WS_TABSTOP
EDITTEXT IDC_EDIT15,327,59,32,12,ES_NUMBER
@@ -673,17 +673,17 @@
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
- EDITTEXT IDC_EDIT_INSTRUMENT,87,7,29,12,ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_EDIT_INSTRUMENT,87,7,33,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Spin1",IDC_SPIN_INSTRUMENT,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS | WS_TABSTOP,111,8,11,11
EDITTEXT IDC_SAMPLE_NAME,131,6,151,12,ES_AUTOHSCROLL
EDITTEXT IDC_SAMPLE_FILENAME,324,6,105,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT8,87,36,34,12,ES_NUMBER
+ EDITTEXT IDC_EDIT8,84,36,37,12,ES_NUMBER
CONTROL "Spin1",IDC_SPIN8,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,40,8,10
- EDITTEXT IDC_EDIT7,87,53,34,12,ES_NUMBER
- CONTROL "Spin1",IDC_SPIN7,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,57,8,10
- CONTROL "Pan",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,55,71,29,10
- EDITTEXT IDC_EDIT9,87,70,34,12,ES_NUMBER
- CONTROL "Spin1",IDC_SPIN9,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,74,8,11
+ EDITTEXT IDC_EDIT7,84,53,37,12,ES_AUTOHSCROLL | ES_NUMBER
+ CONTROL "",IDC_SPIN7,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,57,8,10
+ CONTROL "Set Pan",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,42,72,42,10
+ EDITTEXT IDC_EDIT9,84,70,37,12,ES_NUMBER
+ CONTROL "",IDC_SPIN9,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,74,8,11
EDITTEXT IDC_EDIT15,33,99,27,13
CONTROL "Spin1",IDC_SPIN12,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,61,103,7,11
COMBOBOX IDC_COMBO4,95,99,27,91,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
@@ -742,7 +742,6 @@
CTEXT "Cutoff",IDC_STATIC,136,133,33,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
CTEXT "Reso",IDC_STATIC,136,151,33,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
CTEXT "Resampling",IDC_STATIC,7,151,39,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
- CONTROL "Highpass",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | BS_FLAT | NOT WS_VISIBLE | WS_TABSTOP,181,19,45,10
CTEXT "Mode",IDC_STATIC,135,70,23,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
RTEXT "--",IDC_TEXT1,186,62,45,8
GROUPBOX "Pitch/Tempo Lock",IDC_STATIC,364,57,89,25
@@ -1159,7 +1158,7 @@
CONTROL "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | WS_TABSTOP,59,126,83,18
LTEXT "High",IDC_STATIC,149,129,16,8
CTEXT "Pre-Amp",IDC_STATIC,197,78,35,8
- CONTROL "Slider2",IDC_SLIDER_PREAMP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | WS_TABSTOP,201,89,27,62
+ CONTROL "Slider2",IDC_SLIDER_PREAMP,"msctls_trackbar32",TBS_AUTOTICKS | TBS_VERT | TBS_BOTH | TBS_TOOLTIPS | WS_TABSTOP,201,89,27,62
COMBOBOX IDC_COMBO5,133,62,64,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Reverse Stereo",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,80,62,10
CONTROL "Soft Panning",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,92,64,10
Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h 2011-03-25 18:36:23 UTC (rev 829)
+++ trunk/OpenMPT/mptrack/version.h 2011-03-26 13:07:43 UTC (rev 830)
@@ -15,7 +15,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 19
#define VER_MINOR 00
-#define VER_MINORMINOR 30
+#define VER_MINORMINOR 31
//Creates version number from version parts that appears in version string.
//For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
