Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[573] trunk/OpenMPT
|
From: <re...@us...> - 2010-04-20 19:39:09
|
Revision: 573
http://modplug.svn.sourceforge.net/modplug/?rev=573&view=rev
Author: rewbs
Date: 2010-04-20 19:38:59 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
[New] Added combined note delay & note cut command for .mptm only (":xy" means delay until tick x and play for y ticks).
[Mod] Removed old "velocity" volume command, which was experimental and unused.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/CommandSet.h
trunk/OpenMPT/mptrack/Draw_pat.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Mptrack.h
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_mod.cpp
trunk/OpenMPT/soundlib/Load_s3m.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/mod_specifications.h
trunk/OpenMPT/soundlib/modcommand.h
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2010-04-20 19:38:59 UTC (rev 573)
@@ -1279,10 +1279,10 @@
commands[kcSetVolumeITPortaDown].isDummy = false;
commands[kcSetVolumeITPortaDown].Message = "Vol command - Portamento Down";
- commands[kcSetVolumeITVelocity].UID = 1245;
- commands[kcSetVolumeITVelocity].isHidden = false;
- commands[kcSetVolumeITVelocity].isDummy = false;
- commands[kcSetVolumeITVelocity].Message = "Vol command - Velocity";
+ commands[kcSetVolumeITUnused].UID = 1245;
+ commands[kcSetVolumeITUnused].isHidden = true;
+ commands[kcSetVolumeITUnused].isDummy = false;
+ commands[kcSetVolumeITUnused].Message = "Vol command - Unused";
commands[kcSetVolumeITOffset].UID = 1246;
commands[kcSetVolumeITOffset].isHidden = false;
@@ -1529,10 +1529,10 @@
commands[kcSetFXmacroSlide].isDummy = false;
commands[kcSetFXmacroSlide].Message = "FX midi macro slide";
- commands[kcSetFXvelocity].UID = 1295;
- commands[kcSetFXvelocity].isHidden = false;
- commands[kcSetFXvelocity].isDummy = false;
- commands[kcSetFXvelocity].Message = "FX pseudo-velocity (experimental)";
+ commands[kcSetFXdelaycut].UID = 1295;
+ commands[kcSetFXdelaycut].isHidden = false;
+ commands[kcSetFXdelaycut].isDummy = false;
+ commands[kcSetFXdelaycut].Message = "FX combined note delay and note cut";
commands[kcPatternJumpDownh1Select].UID = 1296;
commands[kcPatternJumpDownh1Select].isHidden = true;
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2010-04-20 19:38:59 UTC (rev 573)
@@ -484,7 +484,7 @@
kcSetVolumePortamento, //g
kcSetVolumeITPortaUp, //f
kcSetVolumeITPortaDown, //e
- kcSetVolumeITVelocity, //:
+ kcSetVolumeITUnused, //:
kcSetVolumeITOffset, //o
kcSetVolumeEnd=kcSetVolumeITOffset,
@@ -542,7 +542,7 @@
kcSetFXmacro, //z,z
kcFixedFXend=kcSetFXmacro,
kcSetFXmacroSlide, //?,\
- kcSetFXvelocity, //?,:
+ kcSetFXdelaycut, //?,:
kcSetFXextension, //?,#
kcSetFXEnd=kcSetFXextension,
Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp 2010-04-20 19:38:59 UTC (rev 573)
@@ -289,12 +289,10 @@
srcy = pfnt->nAlphaNZ_Y + 14 * COLUMN_HEIGHT;
break;
//end rewbs.smoothVST
- //rewbs.velocity
case ':':
srcx = pfnt->nAlphaNZ_X;
srcy = pfnt->nAlphaNZ_Y + 15 * COLUMN_HEIGHT;
break;
- //end rewbs.velocity
case ' ':
srcx = pfnt->nSpaceX;
srcy = pfnt->nSpaceY;
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2010-04-20 19:38:59 UTC (rev 573)
@@ -1985,7 +1985,7 @@
#define MOD_TYPE_XMIT (MOD_TYPE_XM|MOD_TYPE_IT)
#define MOD_TYPE_XMITMPT (MOD_TYPE_XM|MOD_TYPE_IT|MOD_TYPE_MPT)
#define MOD_TYPE_ITMPT (MOD_TYPE_IT|MOD_TYPE_MPT)
-#define MAX_FXINFO 69
+#define MAX_FXINFO 70
const MPTEFFECTINFO gFXInfo[MAX_FXINFO] =
@@ -2060,6 +2060,7 @@
// MPT IT extensions and special effects
{CMD_S3MCMDEX, 0xF0,0x90, 0, MOD_TYPE_S3MITMPT, "Sound control"},
{CMD_S3MCMDEX, 0xF0,0x70, 0, MOD_TYPE_ITMPT, "Instr. control"},
+ {CMD_DELAYCUT, 0x00,0x00, 0, MOD_TYPE_MPT, "Note delay and cut"},
// -> CODE#0010
// -> DESC="add extended parameter mechanism to pattern effects"
{CMD_XPARAM, 0x00,0x00, 0, MOD_TYPE_XMITMPT, "X param"},
@@ -2840,7 +2841,7 @@
LPCSTR pszName; // ie "Set Volume"
} MPTVOLCMDINFO;
-#define MAX_VOLINFO 15 //rewbs.volOff & rewbs.velocity: increased from 13
+#define MAX_VOLINFO 15
const MPTVOLCMDINFO gVolCmdInfo[MAX_VOLINFO] =
@@ -2858,8 +2859,8 @@
{VOLCMD_TONEPORTAMENTO, MOD_TYPE_XMITMPT, "g: Tone portamento"},
{VOLCMD_PORTAUP, MOD_TYPE_ITMPT, "f: Portamento up"},
{VOLCMD_PORTADOWN, MOD_TYPE_ITMPT, "e: Portamento down"},
- {VOLCMD_VELOCITY, MOD_TYPE_ITMPT, ":: velocity"}, //rewbs.velocity
- {VOLCMD_OFFSET, MOD_TYPE_ITMPT, "o: offset"}, //rewbs.volOff
+ {VOLCMD_DELAYCUT, MOD_TYPE_ITMPT, ":: (currently unused)"},
+ {VOLCMD_OFFSET, MOD_TYPE_ITMPT, "o: Offset"}, //rewbs.volOff
};
Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/mptrack/Mptrack.h 2010-04-20 19:38:59 UTC (rev 573)
@@ -439,9 +439,9 @@
STATIC_ASSERT(ARRAYELEMCOUNT(szSpecialNoteShortDesc) == ARRAYELEMCOUNT(szSpecialNoteNames));
const LPCSTR szHexChar = "0123456789ABCDEF";
-const LPCSTR gszModCommands = " 0123456789ABCDRFFTE???GHK?YXPLZ\\:#??"; //rewbs.smoothVST: added last \ (written as \\); rewbs.velocity: added last :
-const LPCSTR gszS3mCommands = " JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\:#??"; //rewbs.smoothVST: added last \ (written as \\); rewbs.velocity: added last :
-const LPCSTR gszVolCommands = " vpcdabuhlrgfe:o"; //rewbs.velocity: added last : ; rewbs.volOff added last o
+const LPCSTR gszModCommands = " 0123456789ABCDRFFTE???GHK?YXPLZ\\:#??"; //rewbs.smoothVST: added last \ (written as \\);
+const LPCSTR gszS3mCommands = " JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\:#??"; //rewbs.smoothVST: added last \ (written as \\);
+const LPCSTR gszVolCommands = " vpcdabuhlrgfe:o";
const TCHAR gszEmpty[] = TEXT("");
// Defined in load_mid.cpp
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2010-04-20 19:38:59 UTC (rev 573)
@@ -3763,7 +3763,6 @@
case kcSetVolumePortamento: volcmd = VOLCMD_TONEPORTAMENTO; break;
case kcSetVolumeITPortaUp: if (pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) volcmd = VOLCMD_PORTAUP; break;
case kcSetVolumeITPortaDown: if (pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) volcmd = VOLCMD_PORTADOWN; break;
- case kcSetVolumeITVelocity: if (pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) volcmd = VOLCMD_VELOCITY; break; //rewbs.velocity
case kcSetVolumeITOffset: if (pSndFile->m_nType & (MOD_TYPE_IT | MOD_TYPE_MPT)) volcmd = VOLCMD_OFFSET; break; //rewbs.volOff
}
//if ((pSndFile->m_nType & MOD_TYPE_MOD) && (volcmd > VOLCMD_PANNING)) volcmd = vol = 0;
@@ -3892,18 +3891,6 @@
p->param = (p->param << 4) | v;
if (p->command == m_cmdOld.command) m_cmdOld.param = p->param;
- /*
- if (v >= 0 && v <= 9)
- {
- p->param = (p->param << 4) | v;
- if (p->command == m_cmdOld.command) m_cmdOld.param = p->param;
- }
- else if (v >= 10 && v <= 15)
- {
- p->param = (p->param << 4) | (v + 0x0A);
- if (p->command == m_cmdOld.command) m_cmdOld.param = p->param;
- }
- */
// Check for MOD/XM Speed/Tempo command
if ((pSndFile->m_nType & (MOD_TYPE_MOD|MOD_TYPE_XM))
&& ((p->command == CMD_SPEED) || (p->command == CMD_TEMPO)))
@@ -3912,15 +3899,15 @@
}
}
- DWORD sel = (m_nRow << 16) | m_dwCursor;
- SetCurSel(sel, sel);
- sel &= ~7;
- if(*p != oldcmd)
- {
- pModDoc->SetModified();
- InvalidateArea(sel, sel+5);
- UpdateIndicator();
- }
+ DWORD sel = (m_nRow << 16) | m_dwCursor;
+ SetCurSel(sel, sel);
+ sel &= ~7;
+ if(*p != oldcmd)
+ {
+ pModDoc->SetModified();
+ InvalidateArea(sel, sel+5);
+ UpdateIndicator();
+ }
}
}
Modified: trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
===================================================================
--- trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-04-20 19:38:59 UTC (rev 573)
@@ -229,14 +229,14 @@
5:1242:0:71:1 //Vol command - Portamento: G (KeyDown)
5:1243:0:70:1 //Vol command - Portamento Up: F (KeyDown)
5:1244:0:69:1 //Vol command - Portamento Down: E (KeyDown)
-5:1245:0:186:1 //Vol command - Velocity: ; (KeyDown)
-5:1245:1:186:1 //Vol command - Velocity: Shift+; (KeyDown)
+5:1245:0:186:1 //Vol command - (unused): ; (KeyDown)
+5:1245:1:186:1 //Vol command - (unused): Shift+; (KeyDown)
5:1246:0:79:1 //Vol command - Offset: O (KeyDown)
//----( Pattern Context [bottom] - FX Col (6) )------------
6:1294:0:220:1 //FX midi macro slide: \ (KeyDown)
-6:1295:1:186:1 //FX pseudo-velocity (experimental): Shift+; (KeyDown)
-6:1295:0:186:1 //FX pseudo-velocity (experimental): ; (KeyDown)
+6:1295:1:186:1 //FX combined note cute and note delay: Shift+; (KeyDown)
+6:1295:0:186:1 //FX combined note cute and note delay: ; (KeyDown)
6:1666:0:191:1 //FX parameter extension command: / (KeyDown)
//----( Pattern Context [bottom] - Param Col (7) )------------
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2010-04-20 19:38:59 UTC (rev 573)
@@ -1475,9 +1475,8 @@
if(m_dwLastSavedWithVersion <= MAKE_VERSION_NUMERIC(1, 17, 02, 54) && interpretModplugmade)
m[ch].volcmd = VOLCMD_VIBRATOSPEED;
} else
- // 213-222: Velocity //rewbs.velocity
- if ((vol >= 213) && (vol <= 222)) { m[ch].volcmd = VOLCMD_VELOCITY; m[ch].vol = vol - 213; } else //rewbs.velocity
- // 223-232: Offset //rewbs.VolOffset
+ // 213-222: Unused (was velocity)
+ // 223-232: Offset
if ((vol >= 223) && (vol <= 232)) { m[ch].volcmd = VOLCMD_OFFSET; m[ch].vol = vol - 223; } //rewbs.volOff
lastvalue[ch].volcmd = m[ch].volcmd;
lastvalue[ch].vol = m[ch].vol;
@@ -2205,7 +2204,6 @@
case VOLCMD_TONEPORTAMENTO: vol = 193 + ConvertVolParam(m->vol); break;
case VOLCMD_PORTADOWN: vol = 105 + ConvertVolParam(m->vol); break;
case VOLCMD_PORTAUP: vol = 115 + ConvertVolParam(m->vol); break;
- case VOLCMD_VELOCITY: vol = 213 + ConvertVolParam(m->vol); break; //rewbs.velocity
case VOLCMD_OFFSET: vol = 223 + ConvertVolParam(m->vol); break; //rewbs.volOff
default: vol = 0xFF;
}
Modified: trunk/OpenMPT/soundlib/Load_mod.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mod.cpp 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/soundlib/Load_mod.cpp 2010-04-20 19:38:59 UTC (rev 573)
@@ -56,7 +56,7 @@
case 'Y' - 55: command = CMD_PANBRELLO; break; //34
case 'Z' - 55: command = CMD_MIDI; break; //35
case '\\' - 56: command = CMD_SMOOTHMIDI; break; //rewbs.smoothVST: 36
- case ':' - 21: command = CMD_VELOCITY; break; //rewbs.velocity: 37
+ case ':' - 21: command = CMD_DELAYCUT; break; //37
case '#' + 3: command = CMD_XPARAM; break; //rewbs.XMfixes - XParam is 38
default: command = 0;
}
@@ -153,11 +153,8 @@
else
command = '\\' - 56;
break;
- case CMD_VELOCITY: //rewbs.velocity: 37
- if(bCompatibilityExport)
+ case CMD_DELAYCUT:
command = param = 0;
- else
- command = ':' - 21;
break;
case CMD_XPARAM: //rewbs.XMfixes - XParam is 38
if(bCompatibilityExport)
Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp 2010-04-20 19:38:59 UTC (rev 573)
@@ -80,7 +80,7 @@
{
UINT command = m->command;
UINT param = m->param;
- switch (command + 0x40)
+ switch (command | 0x40)
{
case 'A': command = CMD_SPEED; break;
case 'B': command = CMD_POSITIONJUMP; break;
@@ -109,11 +109,9 @@
case 'Y': command = CMD_PANBRELLO; break;
case 'Z': command = CMD_MIDI; break;
case '\\': command = CMD_SMOOTHMIDI; break; //rewbs.smoothVST
- case ':': command = CMD_VELOCITY; break; //rewbs.velocity
-// -> CODE#0010
-// -> DESC="add extended parameter mechanism to pattern effects"
+ // Chars under 0x40 don't save properly, so map : to ] and # to [.
+ case ']': command = CMD_DELAYCUT; break;
case '[': command = CMD_XPARAM; break;
-// -! NEW_FEATURE#0010
default: command = 0;
}
m->command = command;
@@ -172,12 +170,6 @@
else
command = '\\';
break;
- case CMD_VELOCITY: //rewbs.velocity
- if(bCompatibilityExport)
- command = param = 0;
- else
- command = ':';
- break;
case CMD_XFINEPORTAUPDOWN:
if (param & 0x0F) switch(param & 0xF0)
{
@@ -204,15 +196,19 @@
case 0xB0: if (param & 0x0F) { command = 'D'; param |= 0xF0; } else command=param=0; break;
}
break;
-// -> CODE#0010
-// -> DESC="add extended parameter mechanism to pattern effects"
+ // Chars under 0x40 don't save properly, so map : to ] and # to [.
+ case CMD_DELAYCUT:
+ if(bCompatibilityExport)
+ command = param = 0;
+ else
+ command = ']';
+ break;
case CMD_XPARAM:
if(bCompatibilityExport)
command = param = 0;
else
command = '[';
break;
-// -! NEW_FEATURE#0010
default: command = param = 0;
}
command &= ~0x40;
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2010-04-20 19:38:59 UTC (rev 573)
@@ -1256,6 +1256,13 @@
if((m_dwSongFlags & SONG_FIRSTTICK) == 0) InvertLoop(&Chn[nChn]);
// Process special effects (note delay, pattern delay, pattern loop)
+ if (cmd == CMD_DELAYCUT)
+ {
+ //:xy --> note delay until tick x, note cut at tick x+y
+ nStartTick = (param & 0xF0) >> 4;
+ int cutAtTick = nStartTick + (param & 0x0F);
+ NoteCut(nChn, cutAtTick);
+ } else
if ((cmd == CMD_MODCMDEX) || (cmd == CMD_S3MCMDEX))
{
if ((!param) && (m_nType & (MOD_TYPE_S3M|MOD_TYPE_IT|MOD_TYPE_MPT))) param = pChn->nOldCmdEx; else pChn->nOldCmdEx = param;
@@ -1569,12 +1576,6 @@
else
PortamentoDown(pChn, vol << 2, false);
break;
-
- case VOLCMD_VELOCITY: //rewbs.velocity TEMP algorithm (crappy :)
- pChn->nVolume = vol * 28; //Max nVolume is 255; max vol is 9; 255/9=28
- pChn->dwFlags |= CHN_FASTVOLRAMP;
- if (m_nTickCount == nStartTick) SampleOffset(nChn, 48-(vol << 3), bPorta); //Max vol is 9; 9 << 3 = 48
- break;
case VOLCMD_OFFSET: //rewbs.volOff
if (m_nTickCount == nStartTick)
@@ -1701,8 +1702,6 @@
if (volcmd == VOLCMD_OFFSET)
RetrigNote(nChn, pChn->nRetrigParam, vol << 3);
- else if (volcmd == VOLCMD_VELOCITY)
- RetrigNote(nChn, pChn->nRetrigParam, 48 - (vol << 3));
else
RetrigNote(nChn, pChn->nRetrigParam);
}
@@ -1710,15 +1709,11 @@
{
// XM Retrig
if (param) pChn->nRetrigParam = (BYTE)(param & 0xFF); else param = pChn->nRetrigParam;
- //rewbs.volOffset
//RetrigNote(nChn, param);
if (volcmd == VOLCMD_OFFSET)
RetrigNote(nChn, param, vol << 3);
- else if (volcmd == VOLCMD_VELOCITY)
- RetrigNote(nChn, param, 48 - (vol << 3));
else
RetrigNote(nChn, param);
- //end rewbs.volOffset:
}
break;
@@ -1968,11 +1963,6 @@
}
break;
//rewbs.smoothVST end
-
- //rewbs.velocity
- case CMD_VELOCITY:
- break;
- //end rewbs.velocity
// IMF Commands
case CMD_NOTESLIDEUP:
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2010-04-20 19:38:59 UTC (rev 573)
@@ -3623,10 +3623,6 @@
m->command = CMD_OFFSET;
m->param = m->vol << 3;
break;
- case VOLCMD_VELOCITY:
- m->command = CMD_VOLUME;
- m->param = m->vol * 7;
- break;
default:
break;
}
@@ -3700,10 +3696,6 @@
m->param = m->vol << 3;
m->volcmd = CMD_NONE;
break;
- case VOLCMD_VELOCITY:
- m->volcmd = CMD_VOLUME;
- m->vol *= 7;
- break;
default:
break;
}
@@ -3731,10 +3723,6 @@
m->param = m->vol << 3;
m->volcmd = CMD_NONE;
break;
- case VOLCMD_VELOCITY:
- m->volcmd = CMD_VOLUME;
- m->vol *= 7;
- break;
default:
break;
}
@@ -3756,7 +3744,6 @@
case VOLCMD_VIBRATODEPTH:
// OpenMPT-specific commands
case VOLCMD_OFFSET:
- case VOLCMD_VELOCITY:
m->vol = min(m->vol, 9);
break;
case VOLCMD_PANSLIDELEFT:
@@ -3832,7 +3819,7 @@
case CMD_TREMOLO: return 40;
case CMD_KEYOFF: return 32;
case CMD_SETENVPOSITION: return 24;
- case CMD_VELOCITY: return 16;
+ case CMD_DELAYCUT: return 16;
case CMD_XPARAM: return 8;
case CMD_NONE:
default: return 0;
Modified: trunk/OpenMPT/soundlib/mod_specifications.h
===================================================================
--- trunk/OpenMPT/soundlib/mod_specifications.h 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/soundlib/mod_specifications.h 2010-04-20 19:38:59 UTC (rev 573)
@@ -89,7 +89,7 @@
true, //Has song comments
MAX_ENVPOINTS, //Envelope point count
" JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\:#", // Supported Effects
- " vpcdabuhlrgfe:o", // Supported Volume Column commands
+ " vpcdabuhlrgfe?o", // Supported Volume Column commands
true, // Has "+++" pattern
true, // Has restart position (order)
true, // Supports plugins
@@ -241,8 +241,8 @@
31, //Max Speed
true, //Has song comments
12, //Envelope point count
- " 0123456789ABCDRFFTE???GHK?YXPLZ\\:#", // Supported Effects
- " vpcdabuhlrgfe:o", // Supported Volume Column commands
+ " 0123456789ABCDRFFTE???GHK?YXPLZ\\?#", // Supported Effects
+ " vpcdabuhlrgfe?o", // Supported Volume Column commands
true, // Has "+++" pattern
true, // Has restart position (order)
true, // Supports plugins
@@ -316,7 +316,7 @@
255, //Max Speed
false, //No song comments
0, //No instrument envelopes
- " JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\:#", // Supported Effects
+ " JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\?#", // Supported Effects
" vp?????????????", // Supported Volume Column commands
true, // Has "+++" pattern
false, // Doesn't have restart position (order)
@@ -390,8 +390,8 @@
255, //Max Speed
true, //Has song comments
25, //Envelope point count
- " JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\:#", // Supported Effects
- " vpcdab?h??gfe:o", // Supported Volume Column commands
+ " JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\?#", // Supported Effects
+ " vpcdab?h??gfe?o", // Supported Volume Column commands
true, // Has "+++" pattern
true, // Has restart position (order)
true, // Supports plugins
Modified: trunk/OpenMPT/soundlib/modcommand.h
===================================================================
--- trunk/OpenMPT/soundlib/modcommand.h 2010-04-19 19:20:17 UTC (rev 572)
+++ trunk/OpenMPT/soundlib/modcommand.h 2010-04-20 19:38:59 UTC (rev 573)
@@ -96,7 +96,7 @@
#define VOLCMD_TONEPORTAMENTO 11
#define VOLCMD_PORTAUP 12
#define VOLCMD_PORTADOWN 13
-#define VOLCMD_VELOCITY 14 //rewbs.velocity
+#define VOLCMD_DELAYCUT 14 //currently unused
#define VOLCMD_OFFSET 15 //rewbs.volOff
#define MAX_VOLCMDS 16
@@ -135,7 +135,7 @@
#define CMD_SETENVPOSITION 30
#define CMD_MIDI 31
#define CMD_SMOOTHMIDI 32 //rewbs.smoothVST
-#define CMD_VELOCITY 33 //rewbs.velocity
+#define CMD_DELAYCUT 33
#define CMD_XPARAM 34 // -> CODE#0010 -> DESC="add extended parameter mechanism to pattern effects" -! NEW_FEATURE#0010
#define CMD_NOTESLIDEUP 35 // IMF Gxy
#define CMD_NOTESLIDEDOWN 36 // IMF Hxy
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
