Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[661] trunk/OpenMPT
|
From: <sag...@us...> - 2010-07-26 20:10:00
|
Revision: 661
http://modplug.svn.sourceforge.net/modplug/?rev=661&view=rev
Author: saga-games
Date: 2010-07-26 20:09:53 +0000 (Mon, 26 Jul 2010)
Log Message:
-----------
[Fix] Mod Conversion: Extra fine portamento was not converted properly when converting from IT/MPTM/S3M to XM.
[Imp] Orderlist: Improved sequence name display in context menu.
[Ref] Removed some old, unused code.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_ins.cpp
trunk/OpenMPT/mptrack/Ctrl_ins.h
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/soundlib/modcommand.cpp
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2010-07-23 23:58:27 UTC (rev 660)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.cpp 2010-07-26 20:09:53 UTC (rev 661)
@@ -727,7 +727,6 @@
ON_COMMAND(IDC_CHECK1, OnSetPanningChanged)
ON_COMMAND(IDC_CHECK2, OnEnableCutOff)
ON_COMMAND(IDC_CHECK3, OnEnableResonance)
-// ON_COMMAND(IDC_CHECK4, OnToggleHighpass)
ON_COMMAND(IDC_INSVIEWPLG, TogglePluginEditor) //rewbs.instroVSTi
ON_EN_CHANGE(IDC_EDIT_INSTRUMENT, OnInstrumentChanged)
ON_EN_CHANGE(IDC_SAMPLE_NAME, OnNameChanged)
@@ -792,7 +791,6 @@
DDX_Control(pDX, IDC_CHECK1, m_CheckPanning);
DDX_Control(pDX, IDC_CHECK2, m_CheckCutOff);
DDX_Control(pDX, IDC_CHECK3, m_CheckResonance);
- DDX_Control(pDX, IDC_CHECK4, m_CheckHighpass);
DDX_Control(pDX, IDC_SLIDER1, m_SliderVolSwing);
DDX_Control(pDX, IDC_SLIDER2, m_SliderPanSwing);
DDX_Control(pDX, IDC_SLIDER3, m_SliderCutOff);
@@ -1149,7 +1147,6 @@
m_EditPPS.EnableWindow(bITandMPT);
m_CheckCutOff.EnableWindow(bITandMPT);
m_CheckResonance.EnableWindow(bITandMPT);
- m_CheckHighpass.EnableWindow(bITandMPT);
m_SliderCutOff.EnableWindow(bITandMPT);
m_SliderResonance.EnableWindow(bITandMPT);
m_SpinInstrument.SetRange(1, m_pSndFile->m_nInstruments);
@@ -1231,7 +1228,6 @@
{
m_CheckCutOff.SetCheck((pIns->nIFC & 0x80) ? TRUE : FALSE);
m_CheckResonance.SetCheck((pIns->nIFR & 0x80) ? TRUE : FALSE);
- //m_CheckHighpass.SetCheck(pIns->nFilterMode);
m_SliderVolSwing.SetPos(pIns->nVolSwing);
m_SliderPanSwing.SetPos(pIns->nPanSwing);
m_SliderResSwing.SetPos(pIns->nResSwing);
@@ -2308,40 +2304,7 @@
}
}
-/*
-void CCtrlInstruments::OnToggleHighpass()
-//----------------------------------------
-{
- BOOL bHighpass = IsDlgButtonChecked(IDC_CHECK4);
- if (!m_pModDoc) {
- return;
- }
-
- CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
- MODINSTRUMENT *pIns = pSndFile->Instruments[m_nInstrument];
-
- if (pIns) {
- if (bHighpass) {
- pIns->nFilterMode = FLTMODE_HIGHPASS;
- } else {
- pIns->nFilterMode = 0;
- }
-
- for (UINT i=0; i<MAX_CHANNELS; i++) {
- if (pSndFile->Chn[i].pModInstrument == pIns) {
- pSndFile->Chn[i].nFilterMode = pIns->nFilterMode;
- }
- }
- }
- m_pSndFile->instrumentModified[m_nInstrument-1] = TRUE;
- m_pModDoc->UpdateAllViews(NULL, HINT_INSNAMES, this);
- m_pModDoc->SetModified();
- SwitchToView();
-
-}
-*/
-
void CCtrlInstruments::OnVScroll(UINT nCode, UINT nPos, CScrollBar *pSB)
//----------------------------------------------------------------------
{
Modified: trunk/OpenMPT/mptrack/Ctrl_ins.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_ins.h 2010-07-23 23:58:27 UTC (rev 660)
+++ trunk/OpenMPT/mptrack/Ctrl_ins.h 2010-07-26 20:09:53 UTC (rev 661)
@@ -72,7 +72,7 @@
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;
- CButton m_CheckPanning, m_CheckCutOff, m_CheckResonance, m_CheckHighpass;
+ CButton m_CheckPanning, m_CheckCutOff, m_CheckResonance;
CSliderCtrl m_SliderVolSwing, m_SliderPanSwing, m_SliderCutSwing, m_SliderResSwing,
m_SliderCutOff, m_SliderResonance;
CNoteMapWnd m_NoteMap;
@@ -163,7 +163,6 @@
afx_msg void OnEnableCutOff();
afx_msg void OnEnableResonance();
- //afx_msg void OnToggleHighpass();
afx_msg void OnEditSampleMap();
afx_msg void TogglePluginEditor(); //rewbs.instroVSTi
afx_msg LRESULT OnCustomKeyMsg(WPARAM, LPARAM); //rewbs.customKeys
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2010-07-23 23:58:27 UTC (rev 660)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2010-07-26 20:09:53 UTC (rev 661)
@@ -1068,7 +1068,10 @@
for(SEQUENCEINDEX i = 0; i < numSequences; i++)
{
CString str;
- str.Format(TEXT("%u: %s"), i, (LPCTSTR)pSndFile->Order.GetSequence(i).m_sName);
+ if(pSndFile->Order.GetSequence(i).m_sName.IsEmpty())
+ str.Format(TEXT("Sequence %u"), i);
+ else
+ str.Format(TEXT("%u: %s"), i, (LPCTSTR)pSndFile->Order.GetSequence(i).m_sName);
const UINT flags = (pSndFile->Order.GetCurrentSequenceIndex() == i) ? MF_STRING|MF_CHECKED : MF_STRING;
AppendMenu(menuSequence, flags, ID_SEQUENCE_ITEM + i, str);
}
Modified: trunk/OpenMPT/soundlib/modcommand.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modcommand.cpp 2010-07-23 23:58:27 UTC (rev 660)
+++ trunk/OpenMPT/soundlib/modcommand.cpp 2010-07-26 20:09:53 UTC (rev 661)
@@ -230,8 +230,15 @@
} else
if (m->param >= 0xE0)
{
- m->command = CMD_MODCMDEX;
- m->param = (((m->param & 0x0F)+3) >> 2) | 0x10;
+ if(newTypeIsXM)
+ {
+ m->command = CMD_XFINEPORTAUPDOWN;
+ m->param = 0x10 | (m->param & 0x0F);
+ } else
+ {
+ m->command = CMD_MODCMDEX;
+ m->param = (((m->param & 0x0F) + 3) >> 2) | 0x10;
+ }
} else m->command = CMD_PORTAMENTOUP;
break;
case CMD_PORTAMENTODOWN:
@@ -242,8 +249,15 @@
} else
if (m->param >= 0xE0)
{
- m->command = CMD_MODCMDEX;
- m->param = (((m->param & 0x0F)+3) >> 2) | 0x20;
+ if(newTypeIsXM)
+ {
+ m->command = CMD_XFINEPORTAUPDOWN;
+ m->param = 0x20 | (m->param & 0x0F);
+ } else
+ {
+ m->command = CMD_MODCMDEX;
+ m->param = (((m->param & 0x0F) + 3) >> 2) | 0x20;
+ }
} else m->command = CMD_PORTAMENTODOWN;
break;
case CMD_SPEED:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
