Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1365] trunk/OpenMPT
|
From: <sag...@us...> - 2012-09-28 14:08:50
|
Revision: 1365
http://modplug.svn.sourceforge.net/modplug/?rev=1365&view=rev
Author: saga-games
Date: 2012-09-28 14:08:40 +0000 (Fri, 28 Sep 2012)
Log Message:
-----------
[Imp] Mouse wheel works with more spin controls now (http://bugs.openmpt.org/view.php?id=99)
[Ref] Removed some dead code
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_gen.cpp
trunk/OpenMPT/mptrack/Ctrl_gen.h
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/Tables.cpp
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2012-09-27 22:27:24 UTC (rev 1364)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2012-09-28 14:08:40 UTC (rev 1365)
@@ -32,11 +32,6 @@
ON_COMMAND(IDC_BUTTON_MODTYPE, OnSongProperties)
ON_COMMAND(IDC_BUTTON_PLAYERPROPS, OnPlayerProperties)
ON_COMMAND(IDC_CHECK_LOOPSONG, OnLoopSongChanged)
- ON_COMMAND(IDC_CHECK_BASS, OnXBassChanged)
- ON_COMMAND(IDC_CHECK_SURROUND, OnSurroundChanged)
- ON_COMMAND(IDC_CHECK_REVERB, OnReverbChanged)
- ON_COMMAND(IDC_CHECK_EQ, OnEqualizerChanged)
- ON_COMMAND(IDC_CHECK_AGC, OnAGCChanged)
ON_EN_CHANGE(IDC_EDIT_SONGTITLE, OnTitleChanged)
ON_EN_CHANGE(IDC_EDIT_TEMPO, OnTempoChanged)
ON_EN_CHANGE(IDC_EDIT_SPEED, OnSpeedChanged)
@@ -44,7 +39,6 @@
ON_EN_CHANGE(IDC_EDIT_RESTARTPOS, OnRestartPosChanged)
ON_EN_CHANGE(IDC_EDIT_VSTIVOL, OnVSTiVolChanged)
ON_EN_CHANGE(IDC_EDIT_SAMPLEPA, OnSamplePAChanged)
- ON_CBN_SELCHANGE(IDC_COMBO_RESAMPLING, OnResamplingChanged)
ON_MESSAGE(WM_MOD_UPDATEPOSITION, OnUpdatePosition)
ON_EN_SETFOCUS(IDC_EDIT_SONGTITLE, OnEnSetfocusEditSongtitle)
//}}AFX_MSG_MAP
@@ -76,7 +70,6 @@
DDX_Control(pDX, IDC_SLIDER_SAMPLEPREAMP, m_SliderSamplePreAmp);
DDX_Control(pDX, IDC_EDIT_MODTYPE, m_EditModType);
- DDX_Control(pDX, IDC_COMBO_RESAMPLING, m_ComboResampling);
DDX_Control(pDX, IDC_VUMETER_LEFT, m_VuMeterLeft);
DDX_Control(pDX, IDC_VUMETER_RIGHT, m_VuMeterRight);
//}}AFX_DATA_MAP
@@ -126,15 +119,6 @@
m_SliderVSTiVol.SetRange(0, MAX_SLIDER_VSTI_VOL);
m_SliderSamplePreAmp.SetRange(0, MAX_SLIDER_SAMPLE_VOL);
-
- // -! BEHAVIOUR_CHANGE#0016
- m_ComboResampling.AddString("None");
- m_ComboResampling.AddString("Linear");
- m_ComboResampling.AddString("Cubic spline");
- //rewbs.resamplerConf
- m_ComboResampling.AddString("Polyphase");
- m_ComboResampling.AddString("XMMS-ModPlug");
- //end rewbs.resamplerConf
m_bEditsLocked=false;
UpdateView(HINT_MODGENERAL|HINT_MODTYPE|HINT_MODSEQUENCE|HINT_MPTSETUP, NULL);
OnActivatePage(0);
@@ -188,10 +172,8 @@
if ((pHint == this) || (!m_pSndFile)) return;
if (dwHint & HINT_MODSEQUENCE)
{
- // Detecting max valid restart position
- ORDERINDEX i = 0;
- for (i=0; i<m_pSndFile->Order.size(); i++) if (m_pSndFile->Order[i] == m_pSndFile->Order.GetInvalidPatIndex()) break;
- m_SpinRestartPos.SetRange32(0, i);
+ // Set max valid restart position
+ m_SpinRestartPos.SetRange32(0, m_pSndFile->Order.GetLengthTailTrimmed() - 1);
}
if (dwHint & HINT_MODGENERAL)
{
@@ -218,10 +200,8 @@
m_SliderVSTiVol.SetPos(MAX_SLIDER_VSTI_VOL-m_pSndFile->m_nVSTiVolume);
m_SliderSamplePreAmp.SetPos(MAX_SLIDER_SAMPLE_VOL-m_pSndFile->m_nSamplePreAmp);
m_SliderTempo.SetPos(m_pSndFile->GetModSpecifications().tempoMax - m_pSndFile->m_nDefaultTempo);
-
-
-
}
+
if (dwHint & HINT_MODTYPE)
{
CModSpecifications specs = m_pSndFile->GetModSpecifications();
@@ -245,7 +225,7 @@
m_SliderVSTiVol.EnableWindow(bIsNotMOD_S3M);
m_EditVSTiVol.EnableWindow(bIsNotMOD_S3M);
m_SpinVSTiVol.EnableWindow(bIsNotMOD_S3M);
- m_EditRestartPos.EnableWindow((specs.hasRestartPos || m_pSndFile->m_nRestartPos != 0) ? TRUE : FALSE);
+ m_EditRestartPos.EnableWindow((specs.hasRestartPos || m_pSndFile->m_nRestartPos != 0));
m_SpinRestartPos.EnableWindow(m_EditRestartPos.IsWindowEnabled());
//Note: Sample volume slider is not disabled for MOD
@@ -270,14 +250,7 @@
}
if (dwHint & HINT_MPTSETUP)
{
- DWORD dwSetup = CMainFrame::GetSettings().m_dwQuality;
- m_ComboResampling.SetCurSel(CMainFrame::GetSettings().m_nSrcMode);
CheckDlgButton(IDC_CHECK_LOOPSONG, (CMainFrame::GetSettings().gbLoopSong) ? TRUE : FALSE);
- CheckDlgButton(IDC_CHECK_AGC, (dwSetup & QUALITY_AGC) ? TRUE : FALSE);
- CheckDlgButton(IDC_CHECK_BASS, (dwSetup & QUALITY_MEGABASS) ? TRUE : FALSE);
- CheckDlgButton(IDC_CHECK_REVERB, (dwSetup & QUALITY_REVERB) ? TRUE : FALSE);
- CheckDlgButton(IDC_CHECK_SURROUND, (dwSetup & QUALITY_SURROUND) ? TRUE : FALSE);
- CheckDlgButton(IDC_CHECK_EQ, (dwSetup & QUALITY_EQ) ? TRUE : FALSE);
}
if (dwHint & HINT_MPTOPTIONS)
{
@@ -536,18 +509,6 @@
}
-void CCtrlGeneral::OnResamplingChanged()
-//--------------------------------------
-{
- DWORD n = m_ComboResampling.GetCurSel();
- if ((n < NUM_SRC_MODES) && (n != CMainFrame::GetSettings().m_nSrcMode))
- {
- CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
- if (pMainFrm) pMainFrm->SetupPlayer(CMainFrame::GetSettings().m_dwQuality, n);
- }
-}
-
-
void CCtrlGeneral::OnLoopSongChanged()
//------------------------------------
{
@@ -561,76 +522,6 @@
}
-void CCtrlGeneral::OnAGCChanged()
-//-------------------------------
-{
- BOOL b = IsDlgButtonChecked(IDC_CHECK_AGC);
- DWORD dwQuality = CMainFrame::GetSettings().m_dwQuality & ~QUALITY_AGC;
- if (b) dwQuality |= QUALITY_AGC;
- if (dwQuality != CMainFrame::GetSettings().m_dwQuality)
- {
- CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
- if (pMainFrm) pMainFrm->SetupPlayer(dwQuality, CMainFrame::GetSettings().m_nSrcMode);
- }
-}
-
-
-void CCtrlGeneral::OnXBassChanged()
-//---------------------------------
-{
- BOOL b = IsDlgButtonChecked(IDC_CHECK_BASS);
- DWORD dwQuality = CMainFrame::GetSettings().m_dwQuality & ~QUALITY_MEGABASS;
- if (b) dwQuality |= QUALITY_MEGABASS;
- if (dwQuality != CMainFrame::GetSettings().m_dwQuality)
- {
- CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
- if (pMainFrm) pMainFrm->SetupPlayer(dwQuality, CMainFrame::GetSettings().m_nSrcMode);
- }
-}
-
-
-void CCtrlGeneral::OnReverbChanged()
-//----------------------------------
-{
- BOOL b = IsDlgButtonChecked(IDC_CHECK_REVERB);
- DWORD dwQuality = CMainFrame::GetSettings().m_dwQuality & ~QUALITY_REVERB;
- if (b) dwQuality |= QUALITY_REVERB;
- if (dwQuality != CMainFrame::GetSettings().m_dwQuality)
- {
- CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
- if (pMainFrm) pMainFrm->SetupPlayer(dwQuality, CMainFrame::GetSettings().m_nSrcMode);
- }
-}
-
-
-void CCtrlGeneral::OnSurroundChanged()
-//------------------------------------
-{
- BOOL b = IsDlgButtonChecked(IDC_CHECK_SURROUND);
- DWORD dwQuality = CMainFrame::GetSettings().m_dwQuality & ~QUALITY_SURROUND;
- if (b) dwQuality |= QUALITY_SURROUND;
- if (dwQuality != CMainFrame::GetSettings().m_dwQuality)
- {
- CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
- if (pMainFrm) pMainFrm->SetupPlayer(dwQuality, CMainFrame::GetSettings().m_nSrcMode);
- }
-}
-
-
-void CCtrlGeneral::OnEqualizerChanged()
-//-------------------------------------
-{
- BOOL b = IsDlgButtonChecked(IDC_CHECK_EQ);
- DWORD dwQuality = CMainFrame::GetSettings().m_dwQuality & ~QUALITY_EQ;
- if (b) dwQuality |= QUALITY_EQ;
- if (dwQuality != CMainFrame::GetSettings().m_dwQuality)
- {
- CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
- if (pMainFrm) pMainFrm->SetupPlayer(dwQuality, CMainFrame::GetSettings().m_nSrcMode);
- }
-}
-
-
LRESULT CCtrlGeneral::OnUpdatePosition(WPARAM, LPARAM lParam)
//-----------------------------------------------------------
{
@@ -689,7 +580,7 @@
}
double changeFactor = value / valueAtZeroDB;
- double dB = 10 * log(changeFactor);
+ double dB = 10 * log(changeFactor);
char sign = (dB>=0) ? '+' : ' ';
sprintf(stringToSet, "%c%.2f dB", sign, dB);
@@ -759,7 +650,7 @@
for (int ry=rect.bottom-1; ry>rect.top; ry-=2)
{
int y0 = rect.bottom - ry;
- int n = CLAMP((y0 * NUM_VUMETER_PENS) / cy, 0, NUM_VUMETER_PENS - 1);
+ int n = Clamp((y0 * NUM_VUMETER_PENS) / cy, 0, NUM_VUMETER_PENS - 1);
if (vu < y0)
n += NUM_VUMETER_PENS;
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.h 2012-09-27 22:27:24 UTC (rev 1364)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.h 2012-09-28 14:08:40 UTC (rev 1365)
@@ -66,7 +66,6 @@
m_SpinSamplePA, m_SpinVSTiVol;
CSliderCtrl m_SliderTempo, m_SliderSamplePreAmp, m_SliderGlobalVol, m_SliderVSTiVol;
- CComboBox m_ComboResampling;
CVuMeter m_VuMeterLeft, m_VuMeterRight;
//}}AFX_DATA
//{{AFX_VIRTUAL(CCtrlGeneral)
@@ -92,13 +91,7 @@
afx_msg void OnRestartPosChanged();
afx_msg void OnSongProperties();
afx_msg void OnPlayerProperties();
- afx_msg void OnResamplingChanged();
afx_msg void OnLoopSongChanged();
- afx_msg void OnAGCChanged();
- afx_msg void OnXBassChanged();
- afx_msg void OnReverbChanged();
- afx_msg void OnSurroundChanged();
- afx_msg void OnEqualizerChanged();
afx_msg void OnEnSetfocusEditSongtitle();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2012-09-27 22:27:24 UTC (rev 1364)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2012-09-28 14:08:40 UTC (rev 1365)
@@ -234,12 +234,12 @@
LTEXT "Initial Volume:",IDC_STATIC,6,30,45,8
CONTROL "",IDC_SLIDER1,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,54,24,92,22
EDITTEXT IDC_EDIT1,150,30,36,12,ES_NUMBER
- CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY,174,30,11,14
+ CONTROL "",IDC_SPIN1,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,174,30,11,14
CONTROL "&Mute",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,192,30,42,12
LTEXT "Initial Pan:",IDC_STATIC,6,54,34,8
CONTROL "",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_BOTH | WS_TABSTOP,54,48,92,22
EDITTEXT IDC_EDIT2,150,54,36,12,ES_NUMBER
- CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY,174,54,11,14
+ CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,174,54,11,14
CONTROL "&Surround",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,192,54,42,12
END
@@ -345,7 +345,7 @@
LEFTMARGIN, 7
RIGHTMARGIN, 237
TOPMARGIN, 7
- BOTTOMMARGIN, 69
+ BOTTOMMARGIN, 70
END
END
#endif // APSTUDIO_INVOKED
@@ -605,50 +605,42 @@
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,54,168,12
END
-IDD_CONTROL_GLOBALS DIALOGEX 0, 0, 561, 94
-STYLE DS_SETFONT | WS_CHILD
+IDD_CONTROL_GLOBALS DIALOGEX 0, 0, 374, 98
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
EDITTEXT IDC_EDIT_SONGTITLE,2,3,167,12,ES_AUTOHSCROLL
- CTEXT "Type EXT, ## channels",IDC_EDIT_MODTYPE,173,3,149,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
- GROUPBOX "",IDC_STATIC,1,14,83,78
- LTEXT "Initial tempo:",IDC_STATIC,4,20,44,8
+ CTEXT "Type EXT, ## channels",IDC_EDIT_MODTYPE,174,3,156,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
+ GROUPBOX "",IDC_STATIC,1,14,83,82
+ LTEXT "Initial tempo:",IDC_STATIC,5,20,44,8
CONTROL "",IDC_SLIDER_SONGTEMPO,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_NOTICKS,11,28,15,50
EDITTEXT IDC_EDIT_TEMPO,5,78,29,12,ES_NUMBER
- CONTROL "",IDC_SPIN_TEMPO,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,27,76,11,14
+ CONTROL "",IDC_SPIN_TEMPO,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,27,76,11,14
LTEXT "Ticks/row:",IDC_STATIC,44,40,35,8
EDITTEXT IDC_EDIT_SPEED,44,51,30,12,ES_NUMBER
- CONTROL "Spin1",IDC_SPIN_SPEED,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,67,50,11,14
- LTEXT "Restart:",IDC_STATIC,44,70,26,8
+ CONTROL "Spin1",IDC_SPIN_SPEED,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,67,50,11,14
+ LTEXT "Restart:",IDC_STATIC,44,68,26,8
EDITTEXT IDC_EDIT_RESTARTPOS,44,78,30,12,ES_NUMBER
- CONTROL "Spin1",IDC_SPIN_RESTARTPOS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,65,77,11,14
- GROUPBOX "",IDC_STATIC,83,14,175,78
+ CONTROL "Spin1",IDC_SPIN_RESTARTPOS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,65,77,11,14
+ GROUPBOX "",IDC_STATIC,83,14,175,82
LTEXT "Initial global vol:",IDC_STATIC,90,20,52,8
CONTROL "",IDC_SLIDER_GLOBALVOL,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_NOTICKS | TBS_TOOLTIPS,105,28,15,50
EDITTEXT IDC_EDIT_GLOBALVOL,95,78,36,12,ES_NUMBER
- CONTROL "",IDC_SPIN_GLOBALVOL,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,120,76,11,14
+ CONTROL "",IDC_SPIN_GLOBALVOL,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,124,76,11,14
LTEXT "VSTi vol:",IDC_STATIC,159,20,33,8
CONTROL "",IDC_SLIDER_VSTIVOL,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_NOTICKS | TBS_TOOLTIPS,164,28,15,50
EDITTEXT IDC_EDIT_VSTIVOL,156,78,36,12,ES_NUMBER
- CONTROL "",IDC_SPIN_VSTIVOL,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,180,76,11,14
+ CONTROL "",IDC_SPIN_VSTIVOL,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,184,76,11,14
LTEXT "Sample vol:",IDC_STATIC,212,20,38,8
CONTROL "Slider1",IDC_SLIDER_SAMPLEPREAMP,"msctls_trackbar32",TBS_VERT | TBS_BOTH | TBS_NOTICKS | TBS_TOOLTIPS,221,28,15,50
EDITTEXT IDC_EDIT_SAMPLEPA,212,78,36,12,ES_NUMBER
- CONTROL "",IDC_SPIN_SAMPLEPA,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,238,75,11,14
- PUSHBUTTON "Song Properties...",IDC_BUTTON_MODTYPE,262,18,60,12,NOT WS_TABSTOP
- CONTROL "Loop Song",IDC_CHECK_LOOPSONG,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,263,48,50,10
- PUSHBUTTON "Player Settings...",IDC_BUTTON_PLAYERPROPS,262,59,60,12,NOT WS_TABSTOP
- CTEXT "Not saved with song!",IDC_STATIC,262,73,60,17
- CONTROL "",IDC_VUMETER_LEFT,"Static",SS_BLACKRECT | SS_SUNKEN,325,1,15,91
- CONTROL "",IDC_VUMETER_RIGHT,"Static",SS_BLACKRECT | SS_SUNKEN,343,1,15,91
- GROUPBOX "Player Settings (not saved in song!)",IDC_STATIC,366,6,150,66,NOT WS_VISIBLE
- CONTROL "Bass Expansion",IDC_CHECK_BASS,"Button",BS_AUTOCHECKBOX | BS_FLAT | NOT WS_VISIBLE | WS_TABSTOP,372,18,65,10
- CONTROL "Reverb",IDC_CHECK_REVERB,"Button",BS_AUTOCHECKBOX | BS_FLAT | NOT WS_VISIBLE | WS_TABSTOP,372,30,46,10
- CONTROL "Surround",IDC_CHECK_SURROUND,"Button",BS_AUTOCHECKBOX | BS_FLAT | NOT WS_VISIBLE | WS_TABSTOP,372,42,48,10
- COMBOBOX IDC_COMBO_RESAMPLING,444,54,67,74,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_TABSTOP
- LTEXT "Resampling:",IDC_STATIC,444,42,43,8,NOT WS_VISIBLE
- CONTROL "Graphic EQ",IDC_CHECK_EQ,"Button",BS_AUTOCHECKBOX | BS_FLAT | NOT WS_VISIBLE | WS_TABSTOP,372,54,58,10
- CONTROL "AGC",IDC_CHECK_AGC,"Button",BS_AUTOCHECKBOX | BS_FLAT | NOT WS_VISIBLE | WS_TABSTOP,444,18,31,10
+ CONTROL "",IDC_SPIN_SAMPLEPA,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,238,75,11,14
+ PUSHBUTTON "Song Properties...",IDC_BUTTON_MODTYPE,264,18,66,12,NOT WS_TABSTOP
+ CONTROL "Loop Song",IDC_CHECK_LOOPSONG,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,263,48,67,10
+ PUSHBUTTON "Player Settings...",IDC_BUTTON_PLAYERPROPS,264,60,66,12,NOT WS_TABSTOP
+ CTEXT "Not saved with song!",IDC_STATIC,264,73,68,17
+ CONTROL "",IDC_VUMETER_LEFT,"Static",SS_BLACKRECT | SS_SUNKEN,336,1,15,91
+ CONTROL "",IDC_VUMETER_RIGHT,"Static",SS_BLACKRECT | SS_SUNKEN,354,1,15,91
END
IDD_CONTROL_COMMENTS DIALOGEX 0, 0, 435, 119
@@ -667,7 +659,7 @@
COMBOBOX IDC_COMBO_INSTRUMENT,18,31,102,137,CBS_DROPDOWNLIST | WS_VSCROLL
CTEXT "Row Spacing",IDC_STATIC,168,33,42,8,SS_CENTERIMAGE
EDITTEXT IDC_EDIT_SPACING,216,31,28,12,ES_AUTOHSCROLL | ES_NUMBER | NOT WS_TABSTOP
- CONTROL "Spin1",IDC_SPIN_SPACING,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,236,31,11,11
+ CONTROL "Spin1",IDC_SPIN_SPACING,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,236,31,11,11
PUSHBUTTON "<<",IDC_BUTTON2,3,51,14,15,NOT WS_TABSTOP,WS_EX_STATICEDGE
PUSHBUTTON ">>",IDC_BUTTON1,15,51,14,15,NOT WS_TABSTOP,WS_EX_STATICEDGE
LTEXT "Pattern Name",IDC_STATIC_PATTERNNAME,384,33,48,8,SS_CENTERIMAGE
@@ -684,7 +676,7 @@
GROUPBOX "",IDC_STATIC_SEQUENCE_NAME_FRAME,378,0,174,24
GROUPBOX "",IDC_STATIC,378,23,174,24
EDITTEXT IDC_EDIT_SEQNUM,420,8,28,12,ES_AUTOHSCROLL | ES_NUMBER | NOT WS_TABSTOP
- CONTROL "",IDC_SPIN_SEQNUM,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,438,6,11,11
+ CONTROL "",IDC_SPIN_SEQNUM,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,438,6,11,11
END
IDD_CONTROL_SAMPLES DIALOGEX 0, 0, 544, 106
@@ -693,37 +685,37 @@
BEGIN
CONTROL "Toolbar1",IDC_TOOLBAR1,"ToolbarWindow32",WS_GROUP | 0x4d,4,4,55,17
EDITTEXT IDC_EDIT_SAMPLE,90,6,35,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Spin6",IDC_SPIN_SAMPLE,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,118,4,11,14
+ CONTROL "Spin6",IDC_SPIN_SAMPLE,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,118,4,11,14
COMBOBOX IDC_COMBO_ZOOM,131,6,41,89,CBS_DROPDOWNLIST | WS_VSCROLL
EDITTEXT IDC_EDIT7,57,30,36,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Spin1",IDC_SPIN7,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,87,29,11,11
+ CONTROL "Spin1",IDC_SPIN7,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,87,29,11,11
EDITTEXT IDC_EDIT8,57,43,36,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Spin1",IDC_SPIN8,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,87,42,11,11
+ CONTROL "Spin1",IDC_SPIN8,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,87,42,11,11
CONTROL "Set Pan",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,9,58,42,10
EDITTEXT IDC_EDIT9,57,56,36,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Spin1",IDC_SPIN9,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,87,56,11,11
+ CONTROL "Spin1",IDC_SPIN9,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,87,56,11,11
EDITTEXT IDC_EDIT5,48,70,45,12,ES_AUTOHSCROLL
- CONTROL "Spin1",IDC_SPIN5,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,87,69,11,11
+ CONTROL "Spin1",IDC_SPIN5,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,87,69,11,11
COMBOBOX IDC_COMBO_BASENOTE,48,83,45,89,CBS_DROPDOWNLIST | WS_VSCROLL
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_AUTOHSCROLL | ES_NUMBER
- CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,169,69,11,11
+ CONTROL "Spin1",IDC_SPIN1,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,169,69,11,11
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
+ CONTROL "Spin1",IDC_SPIN2,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 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_AUTOHSCROLL | ES_NUMBER
- CONTROL "Spin1",IDC_SPIN3,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,253,70,11,11
+ CONTROL "Spin1",IDC_SPIN3,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,253,70,11,11
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
+ CONTROL "Spin1",IDC_SPIN4,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 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_AUTOHSCROLL | ES_NUMBER
- CONTROL "Depth",IDC_SPIN12,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,353,59,11,11
+ CONTROL "Depth",IDC_SPIN12,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,353,59,11,11
EDITTEXT IDC_EDIT14,275,83,38,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Sweep",IDC_SPIN11,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,305,84,11,11
+ CONTROL "Sweep",IDC_SPIN11,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,305,84,11,11
EDITTEXT IDC_EDIT16,321,83,38,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Rate",IDC_SPIN13,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,353,83,11,11
+ CONTROL "Rate",IDC_SPIN13,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,353,83,11,11
CONTROL "Time stretching",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | BS_FLAT | NOT WS_VISIBLE | WS_TABSTOP,446,36,68,11
COMBOBOX IDC_COMBO4,400,35,39,61,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_GROUP | WS_TABSTOP
COMBOBOX IDC_COMBO5,400,51,39,86,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_GROUP | WS_TABSTOP
@@ -768,21 +760,21 @@
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
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
+ CONTROL "Spin1",IDC_SPIN_INSTRUMENT,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 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
CTEXT "Global Volume",IDC_STATIC,8,36,72,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
EDITTEXT IDC_EDIT8,84,36,37,12,ES_AUTOHSCROLL | ES_NUMBER
- CONTROL "Spin1",IDC_SPIN8,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,40,8,10
+ CONTROL "Spin1",IDC_SPIN8,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,112,40,8,10
CTEXT "Fade Out",IDC_STATIC,8,53,72,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
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 "",IDC_SPIN7,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | 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_AUTOHSCROLL | ES_NUMBER
- CONTROL "",IDC_SPIN9,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,112,74,8,11
+ CONTROL "",IDC_SPIN9,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,112,74,8,11
CTEXT "Sep",IDC_STATIC,8,99,25,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
EDITTEXT IDC_EDIT15,33,99,27,13,ES_AUTOHSCROLL
- CONTROL "Spin1",IDC_SPIN12,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,54,102,11,11
+ CONTROL "Spin1",IDC_SPIN12,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,54,102,11,11
CTEXT "Centre",IDC_STATIC,69,99,26,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
COMBOBOX IDC_COMBO4,95,99,27,91,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CTEXT "Ramping",IDC_STATIC,7,133,39,13,SS_CENTERIMAGE,WS_EX_STATICEDGE
@@ -818,13 +810,13 @@
COMBOBOX IDC_COMBO5,321,116,37,169,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CTEXT "MIDI Program",IDC_STATIC,246,134,72,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
EDITTEXT IDC_EDIT10,321,134,37,12,ES_AUTOHSCROLL
- CONTROL "Spin1",IDC_SPIN10,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,349,135,8,11
+ CONTROL "Spin1",IDC_SPIN10,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,352,135,8,11
CTEXT "MIDI Bank",IDC_STATIC,245,152,72,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
EDITTEXT IDC_EDIT11,321,152,37,12,ES_AUTOHSCROLL
- CONTROL "",IDC_SPIN11,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,351,153,8,11
+ CONTROL "",IDC_SPIN11,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,351,153,8,11
CTEXT "P. Bend Range",IDC_STATIC,366,99,52,12,SS_CENTERIMAGE,WS_EX_STATICEDGE
EDITTEXT IDC_PITCHWHEELDEPTH,420,99,36,12,ES_AUTOHSCROLL
- CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS | WS_TABSTOP,444,102,11,11
+ CONTROL "",IDC_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_TABSTOP,444,102,11,11
CTEXT "Volume Command Handling",IDC_STATIC,366,116,90,10,SS_CENTERIMAGE,WS_EX_STATICEDGE
COMBOBOX IDC_PLUGIN_VOLUMESTYLE,366,128,90,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Volume commands with note are Velocities",IDC_PLUGIN_VELOCITYSTYLE,
@@ -1636,6 +1628,7 @@
IDD_CONTROL_GLOBALS, DIALOG
BEGIN
+ BOTTOMMARGIN, 94
END
IDD_CONTROL_COMMENTS, DIALOG
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2012-09-27 22:27:24 UTC (rev 1364)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2012-09-28 14:08:40 UTC (rev 1365)
@@ -792,8 +792,6 @@
DWORD dwPadding;
} MODFORMATINFO;
-extern MODFORMATINFO gModFormatInfo[];
-
#endif
Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp 2012-09-27 22:27:24 UTC (rev 1364)
+++ trunk/OpenMPT/soundlib/Tables.cpp 2012-09-28 14:08:40 UTC (rev 1365)
@@ -23,7 +23,7 @@
///////////////////////////////////////////////////////////////////////
#ifndef FASTSOUNDLIB
-MODFORMATINFO gModFormatInfo[] =
+/*MODFORMATINFO gModFormatInfo[] =
{
{ MOD_TYPE_MOD, "ProTracker", ".mod", 0 },
{ MOD_TYPE_S3M, "ScreamTracker III", ".s3m", 0 },
@@ -52,7 +52,7 @@
{ MOD_TYPE_MPT, "OpenMPT", ".mptm", 0 },
{ MOD_TYPE_J2B, "Galaxy Sound System", ".j2b", 0 },
{ MOD_TYPE_IMF, "Imago Orpheus", ".imf", 0 },
-};
+};*/
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
