Menu
▾
▴
modplug-svn-commit — OpenMPT subversion commit notifications
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
(10) |
Sep
|
Oct
|
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
(3) |
Apr
(2) |
May
(10) |
Jun
(2) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2008 |
Jan
(6) |
Feb
(4) |
Mar
(5) |
Apr
(2) |
May
(1) |
Jun
(1) |
Jul
(4) |
Aug
(6) |
Sep
(2) |
Oct
(9) |
Nov
(1) |
Dec
(4) |
| 2009 |
Jan
(9) |
Feb
(2) |
Mar
(2) |
Apr
(2) |
May
(6) |
Jun
(18) |
Jul
(33) |
Aug
(39) |
Sep
(33) |
Oct
(24) |
Nov
(23) |
Dec
(22) |
| 2010 |
Jan
(29) |
Feb
(32) |
Mar
(51) |
Apr
(17) |
May
(31) |
Jun
(21) |
Jul
(32) |
Aug
(28) |
Sep
(35) |
Oct
(27) |
Nov
(11) |
Dec
(13) |
| 2011 |
Jan
(14) |
Feb
(13) |
Mar
(27) |
Apr
(27) |
May
(28) |
Jun
(20) |
Jul
(43) |
Aug
(52) |
Sep
(66) |
Oct
(61) |
Nov
(11) |
Dec
(8) |
| 2012 |
Jan
(20) |
Feb
(30) |
Mar
(38) |
Apr
(21) |
May
(33) |
Jun
(21) |
Jul
(25) |
Aug
(9) |
Sep
(24) |
Oct
(42) |
Nov
(27) |
Dec
(41) |
| 2013 |
Jan
(20) |
Feb
(35) |
Mar
(156) |
Apr
(298) |
May
(258) |
Jun
(201) |
Jul
(105) |
Aug
(60) |
Sep
(193) |
Oct
(245) |
Nov
(280) |
Dec
(194) |
| 2014 |
Jan
(63) |
Feb
(202) |
Mar
(200) |
Apr
(23) |
May
(53) |
Jun
(105) |
Jul
(18) |
Aug
(26) |
Sep
(110) |
Oct
(187) |
Nov
(97) |
Dec
(74) |
| 2015 |
Jan
(45) |
Feb
(55) |
Mar
(116) |
Apr
(116) |
May
(193) |
Jun
(164) |
Jul
(50) |
Aug
(111) |
Sep
(98) |
Oct
(71) |
Nov
(103) |
Dec
(63) |
| 2016 |
Jan
(33) |
Feb
(101) |
Mar
(182) |
Apr
(139) |
May
(140) |
Jun
(103) |
Jul
(165) |
Aug
(286) |
Sep
(208) |
Oct
(127) |
Nov
(97) |
Dec
(54) |
| 2017 |
Jan
(64) |
Feb
(335) |
Mar
(202) |
Apr
(212) |
May
(139) |
Jun
(127) |
Jul
(294) |
Aug
(154) |
Sep
(170) |
Oct
(152) |
Nov
(156) |
Dec
(62) |
| 2018 |
Jan
(168) |
Feb
(237) |
Mar
(196) |
Apr
(174) |
May
(174) |
Jun
(161) |
Jul
(127) |
Aug
(88) |
Sep
(149) |
Oct
(66) |
Nov
(52) |
Dec
(135) |
| 2019 |
Jan
(146) |
Feb
(126) |
Mar
(104) |
Apr
(58) |
May
(60) |
Jun
(28) |
Jul
(197) |
Aug
(129) |
Sep
(141) |
Oct
(148) |
Nov
(63) |
Dec
(100) |
| 2020 |
Jan
(74) |
Feb
(37) |
Mar
(59) |
Apr
(154) |
May
(194) |
Jun
(133) |
Jul
(313) |
Aug
(197) |
Sep
(49) |
Oct
(162) |
Nov
(143) |
Dec
(57) |
| 2021 |
Jan
(120) |
Feb
(107) |
Mar
(314) |
Apr
(157) |
May
(524) |
Jun
(169) |
Jul
(72) |
Aug
(133) |
Sep
(135) |
Oct
(146) |
Nov
(198) |
Dec
(325) |
| 2022 |
Jan
(409) |
Feb
(249) |
Mar
(138) |
Apr
(95) |
May
(102) |
Jun
(221) |
Jul
(66) |
Aug
(120) |
Sep
(192) |
Oct
(131) |
Nov
(53) |
Dec
(171) |
| 2023 |
Jan
(357) |
Feb
(82) |
Mar
(168) |
Apr
(218) |
May
(196) |
Jun
(86) |
Jul
(115) |
Aug
(49) |
Sep
(190) |
Oct
(102) |
Nov
(45) |
Dec
(76) |
| 2024 |
Jan
(86) |
Feb
(50) |
Mar
(324) |
Apr
(209) |
May
(197) |
Jun
(232) |
Jul
(194) |
Aug
(247) |
Sep
(219) |
Oct
(266) |
Nov
(328) |
Dec
(304) |
| 2025 |
Jan
(191) |
Feb
(115) |
Mar
(137) |
Apr
(32) |
May
(126) |
Jun
(403) |
Jul
(213) |
Aug
(203) |
Sep
(148) |
Oct
(109) |
Nov
(191) |
Dec
(209) |
| 2026 |
Jan
(127) |
Feb
(123) |
Mar
(160) |
Apr
(141) |
May
(45) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sag...@us...> - 2010-01-25 16:39:12
|
Revision: 476
http://modplug.svn.sourceforge.net/modplug/?rev=476&view=rev
Author: saga-games
Date: 2010-01-25 16:38:56 +0000 (Mon, 25 Jan 2010)
Log Message:
-----------
[Fix] Installer: Uninstalling config files should work properly now.
Modified Paths:
--------------
trunk/OpenMPT/installer/install.iss
Modified: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss 2010-01-23 16:55:32 UTC (rev 475)
+++ trunk/OpenMPT/installer/install.iss 2010-01-25 16:38:56 UTC (rev 476)
@@ -51,8 +51,8 @@
Source: "..\packageTemplate\extraKeymaps\*.*"; DestDir: "{app}\extraKeymaps"; Flags: ignoreversion
; kind of auto-backup - handy!
-Source: "{userappdata}\OpenMPT\mptrack.ini"; DestDir: "{userappdata}\OpenMPT\mptrack.ini.old"; Flags: external skipifsourcedoesntexist; Tasks: not portable
-Source: "{userappdata}\OpenMPT\plugin.cache"; DestDir: "{userappdata}\OpenMPT\plugin.cache.old"; Flags: external skipifsourcedoesntexist; Tasks: not portable
+Source: "{userappdata}\OpenMPT\mptrack.ini"; DestDir: "{userappdata}\OpenMPT"; DestName: "mptrack.ini.old"; Flags: external skipifsourcedoesntexist; Tasks: not portable
+Source: "{userappdata}\OpenMPT\plugin.cache"; DestDir: "{userappdata}\OpenMPT"; DestName: "plugin.cache.old"; Flags: external skipifsourcedoesntexist; Tasks: not portable
[Dirs]
; option dirs for non-portable mode
@@ -77,7 +77,7 @@
[INI]
; enable portable mode
-Filename: "{app}\mptrack.ini"; Section: "Paths"; Key: "UseAppDataDirectory"; String: "0"; Flags: uninsdeleteentry createkeyifdoesntexist; Tasks: portable
+Filename: "{app}\mptrack.ini"; Section: "Paths"; Key: "UseAppDataDirectory"; String: "0"; Flags: createkeyifdoesntexist; Tasks: portable
; internet shortcut
Filename: "{app}\ModPlug Central.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.lpchip.com/modplug/"; Flags: createkeyifdoesntexist;
@@ -89,40 +89,53 @@
; internet shortcut has to be deleted manually
Type: files; Name: "{app}\ModPlug Central.url";
; normal installation
-Type: files; Name: "{userappdata}\OpenMPT\mptrack.ini"; Tasks: not portable; Check: DeletePersonalFilesOnUninstall;
-Type: files; Name: "{userappdata}\OpenMPT\plugin.cache"; Tasks: not portable; Check: DeletePersonalFilesOnUninstall;
-Type: files; Name: "{userappdata}\OpenMPT\tunings\local_tunings.tc"; Tasks: not portable; Check: DeletePersonalFilesOnUninstall;
Type: dirifempty; Name: "{userappdata}\OpenMPT\tunings"; Tasks: not portable
Type: dirifempty; Name: "{userappdata}\OpenMPT"; Tasks: not portable
; portable installation
-Type: files; Name: "{app}\mptrack.ini"; Tasks: portable; Check: DeletePersonalFilesOnUninstall;
-Type: files; Name: "{app}\plugin.cache"; Tasks: portable; Check: DeletePersonalFilesOnUninstall;
-Type: files; Name: "{app}\tunings\local_tunings.tc"; Tasks: portable; Check: DeletePersonalFilesOnUninstall;
-Type: dirifempty; Name: "{app}\tunings"; Tasks: portable; Check: DeletePersonalFilesOnUninstall;
+Type: dirifempty; Name: "{app}\tunings"; Tasks: portable;
; crappy workaround for uninstall stuff
[Code]
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
var
- deletesettings: Boolean;
+ filepath: String;
-function DeletePersonalFilesOnUninstall: Boolean;
begin
- Result := deletesettings;
-end;
-
-procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
-begin
- case CurUninstallStep of
+ case CurUninstallStep of
usUninstall:
- begin
- if MsgBox('Do you want to keep your personal settings and tunings?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then
begin
- deletesettings := False;
- end else
- begin
- deletesettings := True;
+ if MsgBox('Do you want to remove OpenMPT settings files (mptrack.ini, Keybindings.mkb, plugin.cache and local_tunings.tc)?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then
+ begin
+ if(GetIniInt('Paths', 'UseAppDataDirectory', 1, 0, 0, ExpandConstant('{app}\mptrack.ini')) = 1) then
+ begin
+ filepath := ExpandConstant('{userappdata}\OpenMPT\mptrack.ini');
+ if FileExists(filepath) then DeleteFile(filepath);
+
+ filepath := ExpandConstant('{userappdata}\OpenMPT\Keybindings.mkb');
+ if FileExists(filepath) then DeleteFile(filepath);
+
+ filepath := ExpandConstant('{userappdata}\OpenMPT\plugin.cache');
+ if FileExists(filepath) then DeleteFile(filepath);
+
+ filepath := ExpandConstant('{userappdata}\OpenMPT\tunings\local_tunings.tc');
+ if FileExists(filepath) then DeleteFile(filepath);
+ end else
+ begin
+ filepath := ExpandConstant('{app}\mptrack.ini');
+ if FileExists(filepath) then DeleteFile(filepath);
+
+ filepath := ExpandConstant('{app}\Keybindings.mkb');
+ if FileExists(filepath) then DeleteFile(filepath);
+
+ filepath := ExpandConstant('{app}\plugin.cache');
+ if FileExists(filepath) then DeleteFile(filepath);
+
+ filepath := ExpandConstant('{app}\tunings\local_tunings.tc');
+ if FileExists(filepath) then DeleteFile(filepath);
+ end;
+ end;
end;
- end;
- end;
+ end;
end;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-23 16:55:42
|
Revision: 475
http://modplug.svn.sourceforge.net/modplug/?rev=475&view=rev
Author: saga-games
Date: 2010-01-23 16:55:32 +0000 (Sat, 23 Jan 2010)
Log Message:
-----------
[Fix] Mod specs: If necessary (S3M), disable restart position edit control on general tab, reset restart position attribute when converting
[Ref] Internal: Some variable type refactoring
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_gen.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/mod_specifications.h
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2010-01-22 23:43:38 UTC (rev 474)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp 2010-01-23 16:55:32 UTC (rev 475)
@@ -217,6 +217,7 @@
m_SliderVSTiVol.EnableWindow(bIsNotMOD_S3M);
m_EditVSTiVol.EnableWindow(bIsNotMOD_S3M);
m_SpinVSTiVol.EnableWindow(bIsNotMOD_S3M);
+ m_EditRestartPos.EnableWindow(specs.hasRestartPos ? TRUE : FALSE);
//Note: Global volume slider is not disabled for MOD
//on purpose(can be used to control play volume)
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2010-01-22 23:43:38 UTC (rev 474)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2010-01-23 16:55:32 UTC (rev 475)
@@ -1801,7 +1801,7 @@
//--------------------------------
{
m_nPreAmp = n;
- if (m_pSndFile) m_pSndFile->SetMasterVolume(m_nPreAmp, TRUE);
+ if (m_pSndFile) m_pSndFile->SetMasterVolume(m_nPreAmp, true);
}
@@ -1864,7 +1864,7 @@
pSndFile->SetRepeatCount((gbLoopSong) ? -1 : 0);
}
}
- m_pSndFile->SetMasterVolume(m_nPreAmp, TRUE);
+ m_pSndFile->SetMasterVolume(m_nPreAmp, true);
m_pSndFile->InitPlayer(TRUE);
memset(NotifyBuffer, 0, sizeof(NotifyBuffer));
m_dwStatus |= MODSTATUS_PLAYING;
@@ -1957,7 +1957,7 @@
return FALSE;
}
gsdwTotalSamples = 0;
- m_pSndFile->SetMasterVolume(m_nPreAmp, TRUE);
+ m_pSndFile->SetMasterVolume(m_nPreAmp, true);
m_pSndFile->InitPlayer(TRUE);
m_dwStatus |= MODSTATUS_PLAYING;
if (gpSoundDevice) gpSoundDevice->Start();
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2010-01-22 23:43:38 UTC (rev 474)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2010-01-23 16:55:32 UTC (rev 475)
@@ -344,6 +344,14 @@
}
}
+ // Is the "restart position" value allowed in this format?
+ if(CSoundFile::GetModSpecifications(nNewType).hasRestartPos == false)
+ {
+ m_SndFile.m_nRestartPos = 0;
+ AddToLog("WARNING: Restart position is not support by the new format.\n");
+ }
+
+
// Fix channel settings (pan/vol)
for(CHANNELINDEX nChn = 0; nChn < m_SndFile.m_nChannels; nChn++)
{
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2010-01-22 23:43:38 UTC (rev 474)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2010-01-23 16:55:32 UTC (rev 475)
@@ -1029,18 +1029,17 @@
}
-BOOL CSoundFile::SetMasterVolume(UINT nVol, BOOL bAdjustAGC)
-//----------------------------------------------------------
+void CSoundFile::SetMasterVolume(UINT nVol, bool adjustAGC)
+//---------------------------------------------------------
{
if (nVol < 1) nVol = 1;
if (nVol > 0x200) nVol = 0x200; // x4 maximum
- if ((nVol < m_nMasterVolume) && (nVol) && (gdwSoundSetup & SNDMIX_AGC) && (bAdjustAGC))
+ if ((nVol < m_nMasterVolume) && (nVol) && (gdwSoundSetup & SNDMIX_AGC) && (adjustAGC))
{
gnAGC = gnAGC * m_nMasterVolume / nVol;
if (gnAGC > AGC_UNITY) gnAGC = AGC_UNITY;
}
m_nMasterVolume = nVol;
- return TRUE;
}
@@ -1058,15 +1057,17 @@
}
-/*
-UINT CSoundFile::GetNumInstruments() const
-//----------------------------------------
+PATTERNINDEX CSoundFile::GetNumPatterns() const
+//---------------------------------------------
{
- UINT n=0;
- for (UINT i=0; i<MAX_INSTRUMENTS; i++) if (Ins[i].pSample) n++;
- return n;
+ PATTERNINDEX max = 0;
+ for(PATTERNINDEX i = 0; i < Patterns.Size(); i++)
+ {
+ if(Patterns.IsValidPat(i))
+ max = i;
+ }
+ return max;
}
-*/
UINT CSoundFile::GetMaxPosition() const
@@ -2623,8 +2624,8 @@
}
-BOOL CSoundFile::SetPatternName(UINT nPat, LPCSTR lpszName)
-//---------------------------------------------------------
+BOOL CSoundFile::SetPatternName(PATTERNINDEX nPat, LPCSTR lpszName)
+//------------------------------------------------------------------
{
CHAR szName[MAX_PATTERNNAME] = "";
if (nPat >= Patterns.Size()) return FALSE;
@@ -2652,8 +2653,8 @@
}
-BOOL CSoundFile::GetPatternName(UINT nPat, LPSTR lpszName, UINT cbSize) const
-//---------------------------------------------------------------------------
+BOOL CSoundFile::GetPatternName(PATTERNINDEX nPat, LPSTR lpszName, UINT cbSize) const
+//-----------------------------------------------------------------------------------
{
if ((!lpszName) || (!cbSize)) return FALSE;
lpszName[0] = 0;
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2010-01-22 23:43:38 UTC (rev 474)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2010-01-23 16:55:32 UTC (rev 475)
@@ -628,10 +628,10 @@
//it returned the number of channels with volume != 0
CHANNELINDEX GetNumChannels() const {return static_cast<CHANNELINDEX>(m_nChannels);}
- BOOL SetMasterVolume(UINT vol, BOOL bAdjustAGC=FALSE);
+ void SetMasterVolume(UINT vol, bool adjustAGC = false);
UINT GetMasterVolume() const { return m_nMasterVolume; }
ORDERINDEX GetNumPatterns() const;
- INSTRUMENTINDEX GetNumInstruments() const {return m_nInstruments;}
+ INSTRUMENTINDEX GetNumInstruments() const { return m_nInstruments; }
SAMPLEINDEX GetNumSamples() const { return m_nSamples; }
UINT GetCurrentPos() const;
UINT GetCurrentPattern() const { return m_nPattern; }
@@ -671,8 +671,8 @@
BOOL IsPaused() const { return (m_dwSongFlags & SONG_PAUSED) ? TRUE : FALSE; }
void LoopPattern(PATTERNINDEX nPat, ROWINDEX nRow = 0);
void CheckCPUUsage(UINT nCPU);
- BOOL SetPatternName(UINT nPat, LPCSTR lpszName);
- BOOL GetPatternName(UINT nPat, LPSTR lpszName, UINT cbSize=MAX_PATTERNNAME) const;
+ BOOL SetPatternName(PATTERNINDEX nPat, LPCSTR lpszName);
+ BOOL GetPatternName(PATTERNINDEX nPat, LPSTR lpszName, UINT cbSize=MAX_PATTERNNAME) const;
CHANNELINDEX ReArrangeChannels(const vector<CHANNELINDEX>& fromToArray);
bool MoveChannel(UINT chn_from, UINT chn_to);
Modified: trunk/OpenMPT/soundlib/mod_specifications.h
===================================================================
--- trunk/OpenMPT/soundlib/mod_specifications.h 2010-01-22 23:43:38 UTC (rev 474)
+++ trunk/OpenMPT/soundlib/mod_specifications.h 2010-01-23 16:55:32 UTC (rev 475)
@@ -42,6 +42,7 @@
char commands[MAX_EFFECTS + 1]; // An array holding all commands this format supports; commands that are not supported are marked with "?"
char volcommands[MAX_VOLCMDS + 1]; // dito, but for volume column
bool hasIgnoreIndex; // Does "+++" pattern exist?
+ bool hasRestartPos;
};
@@ -81,6 +82,7 @@
" JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\:#", // Supported Effects
" vpcdabuhlrgfe:o", // Supported Volume Column commands
true, // Has "+++" pattern
+ true, // Has restart position (order)
};
@@ -115,6 +117,7 @@
" 0123456789ABCD?FF?E???????????????", // Supported Effects
" ???????????????", // Supported Volume Column commands
false, // Doesn't have "+++" pattern
+ true, // Has restart position (order)
};
// MOD with MPT extensions.
@@ -147,6 +150,7 @@
" 0123456789ABCD?FF?E???????????????", // Supported Effects
" ???????????????", // Supported Volume Column commands
true, // Has "+++" pattern
+ true, // Has restart position (order)
};
const CModSpecifications xm =
@@ -178,6 +182,7 @@
" 0123456789ABCDRFFTE???GHK?YXPLZ\\:#", // Supported Effects
" vpcdabuhlrg????", // Supported Volume Column commands
false, // Doesn't have "+++" pattern
+ true, // Has restart position (order)
};
// XM with MPT extensions
@@ -210,6 +215,7 @@
" 0123456789ABCDRFFTE???GHK?YXPLZ\\:#", // Supported Effects
" vpcdabuhlrgfe:o", // Supported Volume Column commands
true, // Has "+++" pattern
+ true, // Has restart position (order)
};
const CModSpecifications s3m =
@@ -241,6 +247,7 @@
" JFEGHLKRXODB?CQATI?SMNVW?U????????", // Supported Effects
" vp?????????????", // Supported Volume Column commands
true, // Has "+++" pattern
+ false, // Doesn't have restart position (order)
};
// S3M with MPT extensions
@@ -273,6 +280,7 @@
" JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\:#", // Supported Effects
" vp?????????????", // Supported Volume Column commands
true, // Has "+++" pattern
+ false, // Doesn't have restart position (order)
};
const CModSpecifications it =
@@ -304,6 +312,7 @@
" JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z???", // Supported Effects
" vpcdab?h??gfe??", // Supported Volume Column commands
true, // Has "+++" pattern
+ false, // Doesn't have restart position (order)
};
const CModSpecifications itEx =
@@ -335,6 +344,7 @@
" JFEGHLKRXODB?CQATI?SMNVW?UY?P?Z\\:#", // Supported Effects
" vpcdab?h??gfe:o", // Supported Volume Column commands
true, // Has "+++" pattern
+ true, // Has restart position (order)
};
} //namespace ModSpecs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-22 23:43:48
|
Revision: 474
http://modplug.svn.sourceforge.net/modplug/?rev=474&view=rev
Author: saga-games
Date: 2010-01-22 23:43:38 +0000 (Fri, 22 Jan 2010)
Log Message:
-----------
[Imp] Setup: User is asked if they want to keep personal settings.
Modified Paths:
--------------
trunk/OpenMPT/installer/install.iss
trunk/OpenMPT/installer/packageTemplate/readme.txt
Modified: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss 2010-01-21 17:03:40 UTC (rev 473)
+++ trunk/OpenMPT/installer/install.iss 2010-01-22 23:43:38 UTC (rev 474)
@@ -50,6 +50,10 @@
; keymaps
Source: "..\packageTemplate\extraKeymaps\*.*"; DestDir: "{app}\extraKeymaps"; Flags: ignoreversion
+; kind of auto-backup - handy!
+Source: "{userappdata}\OpenMPT\mptrack.ini"; DestDir: "{userappdata}\OpenMPT\mptrack.ini.old"; Flags: external skipifsourcedoesntexist; Tasks: not portable
+Source: "{userappdata}\OpenMPT\plugin.cache"; DestDir: "{userappdata}\OpenMPT\plugin.cache.old"; Flags: external skipifsourcedoesntexist; Tasks: not portable
+
[Dirs]
; option dirs for non-portable mode
Name: "{userappdata}\OpenMPT"; Tasks: not portable
@@ -85,23 +89,40 @@
; internet shortcut has to be deleted manually
Type: files; Name: "{app}\ModPlug Central.url";
; normal installation
-;Type: files; Name: "{userappdata}\OpenMPT\mptrack.ini"; Tasks: not portable
-;Type: files; Name: "{userappdata}\OpenMPT\plugin.cache"; Tasks: not portable
-;Type: files; Name: "{userappdata}\OpenMPT\tunings\local_tunings.tc"; Tasks: not portable
+Type: files; Name: "{userappdata}\OpenMPT\mptrack.ini"; Tasks: not portable; Check: DeletePersonalFilesOnUninstall;
+Type: files; Name: "{userappdata}\OpenMPT\plugin.cache"; Tasks: not portable; Check: DeletePersonalFilesOnUninstall;
+Type: files; Name: "{userappdata}\OpenMPT\tunings\local_tunings.tc"; Tasks: not portable; Check: DeletePersonalFilesOnUninstall;
Type: dirifempty; Name: "{userappdata}\OpenMPT\tunings"; Tasks: not portable
Type: dirifempty; Name: "{userappdata}\OpenMPT"; Tasks: not portable
; portable installation
-;Type: files; Name: "{app}\mptrack.ini"; Tasks: portable
-;Type: files; Name: "{app}\plugin.cache"; Tasks: portable
-;Type: files; Name: "{app}\tunings\local_tunings.tc"; Tasks: portable
-Type: dirifempty; Name: "{app}\tunings"; Tasks: portable
+Type: files; Name: "{app}\mptrack.ini"; Tasks: portable; Check: DeletePersonalFilesOnUninstall;
+Type: files; Name: "{app}\plugin.cache"; Tasks: portable; Check: DeletePersonalFilesOnUninstall;
+Type: files; Name: "{app}\tunings\local_tunings.tc"; Tasks: portable; Check: DeletePersonalFilesOnUninstall;
+Type: dirifempty; Name: "{app}\tunings"; Tasks: portable; Check: DeletePersonalFilesOnUninstall;
+; crappy workaround for uninstall stuff
+[Code]
+var
+ deletesettings: Boolean;
+function DeletePersonalFilesOnUninstall: Boolean;
+begin
+ Result := deletesettings;
+end;
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+begin
+ case CurUninstallStep of
+ usUninstall:
+ begin
+ if MsgBox('Do you want to keep your personal settings and tunings?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES then
+ begin
+ deletesettings := False;
+ end else
+ begin
+ deletesettings := True;
+ end;
+ end;
+ end;
+end;
-
-
-
-
-
-
Modified: trunk/OpenMPT/installer/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/installer/packageTemplate/readme.txt 2010-01-21 17:03:40 UTC (rev 473)
+++ trunk/OpenMPT/installer/packageTemplate/readme.txt 2010-01-22 23:43:38 UTC (rev 474)
@@ -14,9 +14,8 @@
Uninstallation
--------------
-An uninstaller is provided. It won't delete your personal settings, so you have
-to delete them yourself, if you don't want to keep them. There is a shortcut to
-settings folder in the installation directory.
+An uninstaller is provided. Don't worry, it will ask you if you want to keep
+your personal settings, nothing will automatically be deleted.
Changes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rel...@us...> - 2010-01-21 17:03:48
|
Revision: 473
http://modplug.svn.sourceforge.net/modplug/?rev=473&view=rev
Author: relabsoluness
Date: 2010-01-21 17:03:40 +0000 (Thu, 21 Jan 2010)
Log Message:
-----------
[Fix] Internal: Fix to random crashes in VC05/08 debug builds caused by different behaviour of security-enhanced CRT functions compared to the originals.
[Imp] PackageTemplate: New files and updates.
Modified Paths:
--------------
trunk/OpenMPT/installer/packageTemplate/readme.txt
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/packageTemplate/History.txt
Added Paths:
-----------
trunk/OpenMPT/packageTemplate/open_settings_folder.bat
trunk/OpenMPT/packageTemplate/readme.txt
Modified: trunk/OpenMPT/installer/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/installer/packageTemplate/readme.txt 2010-01-20 22:09:23 UTC (rev 472)
+++ trunk/OpenMPT/installer/packageTemplate/readme.txt 2010-01-21 17:03:40 UTC (rev 473)
@@ -15,20 +15,10 @@
--------------
An uninstaller is provided. It won't delete your personal settings, so you have
-to delete them yourself, if you don't want to keep them. You can use
-"open_settings_folder.bat" to find them (or just go to %appdata%\OpenMPT).
+to delete them yourself, if you don't want to keep them. There is a shortcut to
+settings folder in the installation directory.
-Making OpenMPT portable
------------------------
-
-By default, OpenMPT stores its settings in %appdata%\OpenMPT. To avoid this,
-create a file called "mptrack.ini" in the same (!) directory as mptrack.exe (if
-it does not exist yet) and add the following lines to this file:
-[Paths]
-UseAppDataDirectory=0
-
-
Changes
-------
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-20 22:09:23 UTC (rev 472)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-21 17:03:40 UTC (rev 473)
@@ -608,6 +608,9 @@
CTrackApp::CTrackApp()
//--------------------
{
+ #if (_MSC_VER >= 1400)
+ _CrtSetDebugFillThreshold(0); // Disable buffer filling in secure enhanced CRT functions.
+ #endif
m_pModTemplate = NULL;
m_pPluginManager = NULL;
m_bInitialized = FALSE;
Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt 2010-01-20 22:09:23 UTC (rev 472)
+++ trunk/OpenMPT/packageTemplate/History.txt 2010-01-21 17:03:40 UTC (rev 473)
@@ -187,7 +187,7 @@
. <Jojo> When no INI file was present, channel separators were completely black.
Keymaps
- + <Jojo> Two new keymaps: French Laptop by Paul Legovitch, Norwegian MPT Classic by Rakib.
+ + <Jojo> Three new keymaps: French Laptop by Paul Legovitch, Norwegian MPT Classic by Rakib, US_mpt_classic_(snu).
/ <Jojo> Updated DE_jojo.mkb
^ <Jojo> When loading a keymap file and unrecognized lines are found, only one messagebox is shown.
/ <Jojo> All keymaps have been updated to version 1 and updated to contain the orderlist shortcuts.
@@ -342,6 +342,7 @@
+ <Jojo> Allow up to 240 envelope points.
+ <Jojo> IT "Note Fade" command: This existed in IT's player routines already, but there was no way to actually use it in the editor. Triggering an invalid note would cause a note fade, so this is a new note type.
+ <re> Channel settings(vol&pan) for channels after 64 will now be saved in the file.
+ + <Jojo> MPTM command S7D explicitely enforces pitch envelope, S7E enforces filter envelope.
IT
+ <Jojo> IT "Note Fade" command: This existed in IT's player routines already, but there was no way to actually use it in the editor. Triggering an invalid note would cause a note fade, so this is a new note type.
Added: trunk/OpenMPT/packageTemplate/open_settings_folder.bat
===================================================================
--- trunk/OpenMPT/packageTemplate/open_settings_folder.bat (rev 0)
+++ trunk/OpenMPT/packageTemplate/open_settings_folder.bat 2010-01-21 17:03:40 UTC (rev 473)
@@ -0,0 +1 @@
+explorer %appdata%\OpenMPT
\ No newline at end of file
Added: trunk/OpenMPT/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/readme.txt (rev 0)
+++ trunk/OpenMPT/packageTemplate/readme.txt 2010-01-21 17:03:40 UTC (rev 473)
@@ -0,0 +1,106 @@
+******************
+* OpenMPT 1.18 *
+******************
+
+
+Installation
+------------
+
+-If you have an existing installation of OpenMPT and wish to re-use its
+ settings, copy your mptrack.ini and plugin.cache to the directory into which
+ you extract the archive.
+-If not, you're done: just extract the archive and launch mptrack.exe.
+
+
+Uninstallation
+--------------
+
+-Delete the files extracted from the archive and optionally the OpenMPT
+ setting files, which are by default stored in %appdata%\OpenMPT.
+
+
+Making OpenMPT portable
+-----------------------
+
+By default, OpenMPT stores its settings in %appdata%\OpenMPT. To avoid this,
+create a file called "mptrack.ini" in the same directory as mptrack.exe (if
+it does not exist yet) and add the following lines to this file:
+[Paths]
+UseAppDataDirectory=0
+
+
+Changes
+-------
+
+See history.txt.
+
+
+Questions, comments, bug reports...
+-----------------------------------
+
+See forums at http://modplug.sourceforge.net/.
+
+
+Release package contents:
+-------------------------
+extraKeymaps(folder):
+soundtouch(folder): SoundTouch readme and copying.txt
+history.txt: Version history.
+mptrack.exe: Main executable.
+open_settings_folder.bat: Opens settings folder.
+OpenMPT_SoundTouch_i16.dll: Slightly customized SoundTouch library used in time
+ stretching feature.
+readme.txt:
+unmo3.dll: Used in MO3-file import.
+
+
+Misc:
+-----
+
+OpenMPT is partially under the following license:
+
+> Copyright (c) 2004-2010, OpenMPT contributors
+> Copyright (c) 1997-2003, Olivier Lapicque
+> All rights reserved.
+>
+> Redistribution and use in source and binary forms, with or without
+> modification, are permitted provided that the following conditions are met:
+> * Redistributions of source code must retain the above copyright
+> notice, this list of conditions and the following disclaimer.
+> * Redistributions in binary form must reproduce the above copyright
+> notice, this list of conditions and the following disclaimer in the
+> documentation and/or other materials provided with the distribution.
+> * Neither the name of the OpenMPT project nor the
+> names of its contributors may be used to endorse or promote products
+> derived from this software without specific prior written permission.
+>
+> THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY
+> EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+> WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+> DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+> DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+> (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+> ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+ASIO is a trademark and software of Steinberg Media Technologies GmbH
+VST is a trademark of Steinberg Media Technologies GmbH
+
+For more information about SoundTouch, see folder SoundTouch.
+
+unmo3.dll
+---------
+Copyright (c) 2001-2009 Ian Luck. All rights reserved
+
+The MO3 software is free for non-commercial use; if anyone tries to
+charge you for it, kick 'em where it hurts!
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED "AS
+IS", WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT
+NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
+PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD LIABLE FOR ANY DAMAGE THAT MAY
+RESULT FROM THE USE OF THIS SOFTWARE. YOU USE THIS SOFTWARE ENTIRELY AT YOUR OWN
+RISK.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-20 22:10:16
|
Revision: 472
http://modplug.svn.sourceforge.net/modplug/?rev=472&view=rev
Author: saga-games
Date: 2010-01-20 22:09:23 +0000 (Wed, 20 Jan 2010)
Log Message:
-----------
[Mod] Changed a label in the installer
[New] MPTM command S7D explicitely enforces pitch envelope, S7E enforces filter envelope.
Modified Paths:
--------------
trunk/OpenMPT/installer/install.iss
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/soundlib/Snd_defs.h
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndmix.cpp
Modified: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss 2010-01-19 22:57:23 UTC (rev 471)
+++ trunk/OpenMPT/installer/install.iss 2010-01-20 22:09:23 UTC (rev 472)
@@ -28,7 +28,7 @@
; icons and install mode
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-Name: "portable"; Description: "Use program directory to store configuration in (portable mode)"; GroupDescription: "Options:"; Flags: unchecked
+Name: "portable"; Description: "Use program directory to store configuration in"; GroupDescription: "Options:"; Flags: unchecked
; file associations - put this below all other [tasks]!
#include "filetypes.iss"
@@ -104,3 +104,4 @@
+
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2010-01-19 22:57:23 UTC (rev 471)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2010-01-20 22:09:23 UTC (rev 472)
@@ -1834,7 +1834,7 @@
//rewbs.graph
void CModDoc::OnEditGraph()
-//----------------------------
+//-------------------------
{
if (m_SndFile.m_nType & (MOD_TYPE_XM|MOD_TYPE_IT | MOD_TYPE_MPT)) SendMessageToActiveViews(WM_MOD_ACTIVATEVIEW, IDD_CONTROL_GRAPH);
}
@@ -2646,6 +2646,9 @@
case 0x0A: strcpy(s, "7A: Pan Env On"); break;
case 0x0B: strcpy(s, "7B: Pitch Env Off"); break;
case 0x0C: strcpy(s, "7C: Pitch Env On"); break;
+ // intentional fall-through follows
+ case 0x0D: if(m_SndFile.GetType() == MOD_TYPE_MPT) { strcpy(s, "7D: Force Pitch Env"); break; }
+ case 0x0E: if(m_SndFile.GetType() == MOD_TYPE_MPT) { strcpy(s, "7E: Force Filter Env"); break; }
default: wsprintf(s, "%02X: undefined", param); break;
}
} else
Modified: trunk/OpenMPT/soundlib/Snd_defs.h
===================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h 2010-01-19 22:57:23 UTC (rev 471)
+++ trunk/OpenMPT/soundlib/Snd_defs.h 2010-01-20 22:09:23 UTC (rev 472)
@@ -155,7 +155,11 @@
#define CHN_SOLO 0x10000000 // -> CODE#0012 -> DESC="midi keyboard split" -! NEW_FEATURE#0012
#define CHN_NOFX 0x20000000 // -> CODE#0015 -> DESC="channels management dlg" -! NEW_FEATURE#0015
#define CHN_SYNCMUTE 0x40000000
+#define CHN_FILTERENV 0x80000000
+#define CHN_SAMPLEFLAGS (CHN_16BIT|CHN_LOOP|CHN_PINGPONGLOOP|CHN_SUSTAINLOOP|CHN_PINGPONGSUSTAIN|CHN_PANNING|CHN_STEREO|CHN_PINGPONGFLAG)
+#define CHN_CHANNELFLAGS (~CHN_SAMPLEFLAGS)
+
// instrument envelope-specific flags
#define ENV_ENABLED 0x01 // env is enabled
#define ENV_LOOP 0x02 // env loop
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2010-01-19 22:57:23 UTC (rev 471)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2010-01-20 22:09:23 UTC (rev 472)
@@ -554,7 +554,7 @@
{
if(m_nType & (MOD_TYPE_S3M|MOD_TYPE_IT|MOD_TYPE_MPT)) return;
pChn->dwFlags &= ~(CHN_KEYOFF|CHN_NOTEFADE);
- pChn->dwFlags = (pChn->dwFlags & (0xFFFFFF00 | CHN_PINGPONGFLAG)) | (pSmp->uFlags & 0xFF);
+ pChn->dwFlags = (pChn->dwFlags & (CHN_CHANNELFLAGS | CHN_PINGPONGFLAG)) | (pSmp->uFlags & CHN_SAMPLEFLAGS);
} else
{
pChn->dwFlags &= ~(CHN_KEYOFF|CHN_NOTEFADE|CHN_VOLENV|CHN_PANENV|CHN_PITCHENV);
@@ -562,9 +562,9 @@
//IT compatibility tentative fix: Don't change bidi loop direction when
//no sample nor instrument is changed.
if(IsCompatibleMode(TRK_IMPULSETRACKER) && pSmp == pChn->pModSample && !bInstrumentChanged)
- pChn->dwFlags = (pChn->dwFlags & (0xFFFFFF00 | CHN_PINGPONGFLAG)) | (pSmp->uFlags & 0xFF);
+ pChn->dwFlags = (pChn->dwFlags & (CHN_CHANNELFLAGS | CHN_PINGPONGFLAG)) | (pSmp->uFlags & CHN_SAMPLEFLAGS);
else
- pChn->dwFlags = (pChn->dwFlags & 0xFFFFFF00) | (pSmp->uFlags & 0xFF);
+ pChn->dwFlags = (pChn->dwFlags & CHN_CHANNELFLAGS) | (pSmp->uFlags & CHN_SAMPLEFLAGS);
if (pIns)
@@ -574,7 +574,13 @@
if (pIns->PitchEnv.dwFlags & ENV_ENABLED) pChn->dwFlags |= CHN_PITCHENV;
if ((pIns->PitchEnv.dwFlags & ENV_ENABLED) && (pIns->PitchEnv.dwFlags & ENV_FILTER))
{
+ pChn->dwFlags |= CHN_FILTERENV;
if (!pChn->nCutOff) pChn->nCutOff = 0x7F;
+ } else
+ {
+ // Special case: Reset filter envelope flag manually (because of S7D/S7E effects).
+ // This way, the S7x effects can be applied to several notes, as long as they don't come with an instrument number.
+ pChn->dwFlags &= ~CHN_FILTERENV;
}
if (pIns->nIFC & 0x80) pChn->nCutOff = pIns->nIFC & 0x7F;
if (pIns->nIFR & 0x80) pChn->nResonance = pIns->nIFR & 0x7F;
@@ -709,7 +715,7 @@
pChn->nLength = pSmp->nLength;
pChn->nLoopEnd = pSmp->nLength;
pChn->nLoopStart = 0;
- pChn->dwFlags = (pChn->dwFlags & 0xFFFFFF00) | (pSmp->uFlags & 0xFF);
+ pChn->dwFlags = (pChn->dwFlags & CHN_CHANNELFLAGS) | (pSmp->uFlags & CHN_SAMPLEFLAGS);
if (pChn->dwFlags & CHN_SUSTAINLOOP)
{
pChn->nLoopStart = pSmp->nSustainStart;
@@ -2192,6 +2198,7 @@
// Implemented for IMF compatibility, can't actually save this in any formats
// sign should be 1 (up) or -1 (down)
void CSoundFile::NoteSlide(MODCHANNEL *pChn, UINT param, int sign)
+//----------------------------------------------------------------
{
BYTE x, y;
if (m_dwSongFlags & SONG_FIRSTTICK) {
@@ -2593,7 +2600,7 @@
case 0x50: if(((param & 0x0F) < 0x04) || !IsCompatibleMode(TRK_IMPULSETRACKER)) pChn->nPanbrelloType = param & 0x07; break;
// S6x: Pattern Delay for x frames
case 0x60: m_nFrameDelay = param; break;
- // S7x: Envelope Control
+ // S7x: Envelope Control / Instrument Control
case 0x70: if(!(m_dwSongFlags & SONG_FIRSTTICK)) break;
switch(param)
{
@@ -2606,9 +2613,17 @@
{
if (bkp->nMasterChn == nChn+1)
{
- if (param == 1) KeyOff(i); else
- if (param == 2) bkp->dwFlags |= CHN_NOTEFADE; else
- { bkp->dwFlags |= CHN_NOTEFADE; bkp->nFadeOutVol = 0; }
+ if (param == 1)
+ {
+ KeyOff(i);
+ } else if (param == 2)
+ {
+ bkp->dwFlags |= CHN_NOTEFADE;
+ } else
+ {
+ bkp->dwFlags |= CHN_NOTEFADE;
+ bkp->nFadeOutVol = 0;
+ }
}
}
}
@@ -2623,6 +2638,20 @@
case 10: pChn->dwFlags |= CHN_PANENV; break;
case 11: pChn->dwFlags &= ~CHN_PITCHENV; break;
case 12: pChn->dwFlags |= CHN_PITCHENV; break;
+ case 13:
+ case 14:
+ if(GetType() == MOD_TYPE_MPT)
+ {
+ pChn->dwFlags |= CHN_PITCHENV;
+ if(param == 13) // pitch env on, filter env off
+ {
+ pChn->dwFlags &= ~CHN_FILTERENV;
+ } else // filter env on
+ {
+ pChn->dwFlags |= CHN_FILTERENV;
+ }
+ }
+ break;
}
break;
// S8x: Set 4-bit Panning
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2010-01-19 22:57:23 UTC (rev 471)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2010-01-20 22:09:23 UTC (rev 472)
@@ -3227,7 +3227,7 @@
case 0x40: m->param = (m->param & 0x0F) | 0x70; break;
case 0x50:
case 0x60:
- case 0x70:
+ case 0x70: if(((m->param & 0xF0) == 0x70) && ((m->param & 0x0F) > 0x0A)) { m->command = CMD_NONE; break; } // no pitch env in XM format
case 0x90:
case 0xA0: m->command = CMD_XFINEPORTAUPDOWN; break;
case 0xB0: m->param = (m->param & 0x0F) | 0x60; break;
@@ -3275,8 +3275,8 @@
}
} // End if(m->command == CMD_PANNING8)
- //////////////////////////
- // Convert param control
+ /////////////////////////////////////////////////////
+ // Convert param control, extended envelope control
if(oldTypeIsMPT)
{
if(m->note == NOTE_PC || m->note == NOTE_PCS)
@@ -3286,6 +3286,12 @@
m->volcmd = VOLCMD_NONE;
m->note = NOTE_NONE;
}
+
+ // adjust extended envelope control commands
+ if((m->command == CMD_S3MCMDEX) && ((m->param & 0xF0) == 0x70) && ((m->param & 0x0F) > 0x0C))
+ {
+ m->param = 0x7C;
+ }
} // End if(oldTypeIsMPT)
/////////////////////////////////////////
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2010-01-19 22:57:23 UTC (rev 471)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2010-01-20 22:09:23 UTC (rev 472)
@@ -1300,7 +1300,8 @@
}
envpitch = CLAMP(envpitch, -256, 256);
// Filter Envelope: controls cutoff frequency
- if (pIns->PitchEnv.dwFlags & ENV_FILTER)
+ //if (pIns->PitchEnv.dwFlags & ENV_FILTER)
+ if (pChn->dwFlags & CHN_FILTERENV)
{
#ifndef NO_FILTER
SetupChannelFilter(pChn, (pChn->dwFlags & CHN_FILTER) ? false : true, envpitch);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-19 22:57:49
|
Revision: 471
http://modplug.svn.sourceforge.net/modplug/?rev=471&view=rev
Author: saga-games
Date: 2010-01-19 22:57:23 +0000 (Tue, 19 Jan 2010)
Log Message:
-----------
[Mod] Updated default keymap with many shortcuts. Thanks, Snu! (this is the same file as US_mpt_classic_(snu).mkb)
[Mod] Updated Dvorak keymap
[Mod] Updated installer script + readme file.
Modified Paths:
--------------
trunk/OpenMPT/installer/install.iss
trunk/OpenMPT/installer/packageTemplate/readme.txt
trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
trunk/OpenMPT/packageTemplate/History.txt
trunk/OpenMPT/packageTemplate/extraKeymaps/dvorak_(snu).mkb
Added Paths:
-----------
trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(snu).mkb
Modified: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss 2010-01-16 23:55:23 UTC (rev 470)
+++ trunk/OpenMPT/installer/install.iss 2010-01-19 22:57:23 UTC (rev 471)
@@ -9,9 +9,9 @@
AppVersion=1.18.00.00
AppName=OpenMPT
AppPublisher=OpenMPT Devs / Olivier Lapicque
-AppPublisherURL=http://www.openmpt.com/
-AppSupportURL=http://www.openmpt.com/
-AppUpdatesURL=http://www.openmpt.com/
+AppPublisherURL=http://www.modplug.com/
+AppSupportURL=http://www.modplug.com/
+AppUpdatesURL=http://www.modplug.com/
DefaultDirName={pf}\OpenMPT
DefaultGroupName=OpenMPT
AllowNoIcons=yes
@@ -85,15 +85,15 @@
; internet shortcut has to be deleted manually
Type: files; Name: "{app}\ModPlug Central.url";
; normal installation
-Type: files; Name: "{userappdata}\OpenMPT\mptrack.ini"; Tasks: not portable
-Type: files; Name: "{userappdata}\OpenMPT\plugin.cache"; Tasks: not portable
-Type: files; Name: "{userappdata}\OpenMPT\tunings\local_tunings.tc"; Tasks: not portable
+;Type: files; Name: "{userappdata}\OpenMPT\mptrack.ini"; Tasks: not portable
+;Type: files; Name: "{userappdata}\OpenMPT\plugin.cache"; Tasks: not portable
+;Type: files; Name: "{userappdata}\OpenMPT\tunings\local_tunings.tc"; Tasks: not portable
Type: dirifempty; Name: "{userappdata}\OpenMPT\tunings"; Tasks: not portable
Type: dirifempty; Name: "{userappdata}\OpenMPT"; Tasks: not portable
; portable installation
-Type: files; Name: "{app}\mptrack.ini"; Tasks: portable
-Type: files; Name: "{app}\plugin.cache"; Tasks: portable
-Type: files; Name: "{app}\tunings\local_tunings.tc"; Tasks: portable
+;Type: files; Name: "{app}\mptrack.ini"; Tasks: portable
+;Type: files; Name: "{app}\plugin.cache"; Tasks: portable
+;Type: files; Name: "{app}\tunings\local_tunings.tc"; Tasks: portable
Type: dirifempty; Name: "{app}\tunings"; Tasks: portable
@@ -103,3 +103,4 @@
+
Modified: trunk/OpenMPT/installer/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/installer/packageTemplate/readme.txt 2010-01-16 23:55:23 UTC (rev 470)
+++ trunk/OpenMPT/installer/packageTemplate/readme.txt 2010-01-19 22:57:23 UTC (rev 471)
@@ -14,17 +14,17 @@
Uninstallation
--------------
-An uninstaller is provided. It will also uninstall custom settings and tunings,
-so if you want to keep those, back them up first. Use "open_settings_folder.bat"
-to find them.
+An uninstaller is provided. It won't delete your personal settings, so you have
+to delete them yourself, if you don't want to keep them. You can use
+"open_settings_folder.bat" to find them (or just go to %appdata%\OpenMPT).
Making OpenMPT portable
-----------------------
By default, OpenMPT stores its settings in %appdata%\OpenMPT. To avoid this,
-create a file called "mptrack.ini" in the same directory as mptrack.exe (if it
-does not exist yet) and add the following lines to this file:
+create a file called "mptrack.ini" in the same (!) directory as mptrack.exe (if
+it does not exist yet) and add the following lines to this file:
[Paths]
UseAppDataDirectory=0
Modified: trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
===================================================================
--- trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-01-16 23:55:23 UTC (rev 470)
+++ trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-01-19 22:57:23 UTC (rev 471)
@@ -13,18 +13,16 @@
0:1031:0:119:1 //Pause song: F8 (KeyDown)
0:1375:0:27:1 //Stop Song: ESC (KeyDown)
0:1029:0:117:1 //Play song from start: F6 (KeyDown)
-0:1027:0:118:5 //Play pattern from start: F7 (KeyDown|KeyHold)
-0:1026:2:118:5 //Play pattern from cursor: Ctrl+F7 (KeyDown|KeyHold)
+0:1027:0:118:1 //Play pattern from start: F7 (KeyDown)
+0:1026:2:118:1 //Play pattern from cursor: Ctrl+F7 (KeyDown)
0:1376:0:120:1 //Toggle Midi Record: F9 (KeyDown)
0:1359:2:90:1 //Undo: Ctrl+Z (KeyDown)
0:1360:2:88:1 //Cut: Ctrl+X (KeyDown)
0:1361:2:67:1 //Copy: Ctrl+C (KeyDown)
-0:1361:2:45:1 //Copy: Ctrl+INSERT (KeyDown)
0:1362:2:86:1 //Paste: Ctrl+V (KeyDown)
0:1362:1:45:1 //Paste: Shift+INSERT (KeyDown)
-0:1363:1:86:1 //Mix Paste: Shift+V (KeyDown)
-0:1793:3:86:1 //Paste Flood: Shift+Ctrl+V (KeyDown)
-0:1820:6:86:1 //Push Forward Paste: Ctrl+Alt+V (KeyDown)
+0:1363:3:86:1 //Mix Paste: Shift+Ctrl+V (KeyDown)
+0:1793:1:86:5 //Paste Flood: Shift+V (KeyDown|KeyHold)
0:1364:2:53:1 //SelectAll: Ctrl+5 (KeyDown)
0:1365:2:70:1 //Find: Ctrl+F (KeyDown)
0:1366:0:114:1 //Find Next: F3 (KeyDown)
@@ -33,6 +31,7 @@
0:1023:4:83:1 //View Samples: Alt+S (KeyDown)
0:1024:4:78:1 //View Instruments: Alt+N (KeyDown)
0:1025:1:120:1 //View Comments: Shift+F9 (KeyDown)
+0:1025:4:67:1 //View Comments: Alt+C (KeyDown)
0:1368:2:113:1 //Toggle Tree View: Ctrl+F2 (KeyDown)
0:1369:2:112:1 //View Options: Ctrl+F1 (KeyDown)
0:1781:2:114:1 //View MIDI mapping: Ctrl+F3 (KeyDown)
@@ -73,19 +72,21 @@
2:1051:2:17:1 //Copy select key: Ctrl (KeyDown)
2:1011:2:76:1 //Select channel / Select all: Ctrl+L (KeyDown)
2:1663:0:122:1 //Toggle follow song: F11 (KeyDown)
-2:1003:0:13:5 //Quick copy: ENTER (KeyDown|KeyHold)
+2:1003:0:13:1 //Quick copy: ENTER (KeyDown)
2:1004:0:32:5 //Quick paste: SPACE (KeyDown|KeyHold)
2:1001:2:32:1 //Enable recording: Ctrl+SPACE (KeyDown)
2:1002:2:13:5 //Play row: Ctrl+ENTER (KeyDown|KeyHold)
2:1317:4:18:1 //Set row jump on note entry: Alt (KeyDown)
2:1685:2:9:1 //Switch to order list: Ctrl+TAB (KeyDown)
+2:1806:2:68:1 //Duplicate pattern: Ctrl+D (KeyDown)
2:1662:6:80:1 //Toggle channel's plugin editor: Ctrl+Alt+P (KeyDown)
2:1062:0:93:1 //Show note properties: Application (KeyDown)
+2:1772:5:80:1 //Show pattern properties window: Shift+Alt+P (KeyDown)
2:1819:2:69:1 //Split Keyboard Settings dialog: Ctrl+E (KeyDown)
-2:1776:6:32:1 //Toggle loop pattern: Ctrl+Alt+SPACE (KeyDown)
-2:1780:2:84:1 //Show playback time at current row: Ctrl+T (KeyDown)
-2:1005:0:121:5 //Mute current channel: F10 (KeyDown|KeyHold)
-2:1006:2:121:5 //Solo current channel: Ctrl+F10 (KeyDown|KeyHold)
+2:1780:2:80:1 //Show playback time at current row: Ctrl+P (KeyDown)
+2:1005:0:121:1 //Mute current channel: F10 (KeyDown)
+2:1006:2:121:1 //Solo current channel: Ctrl+F10 (KeyDown)
+2:1771:6:121:1 //Unmute all channels: Ctrl+Alt+F10 (KeyDown)
2:1786:2:82:1 //Reset channel: Ctrl+R (KeyDown)
2:1007:2:81:5 //Transpose +1: Ctrl+Q (KeyDown|KeyHold)
2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold)
@@ -101,12 +102,12 @@
2:1661:4:68:5 //Shrink selection: Alt+D (KeyDown|KeyHold)
2:1058:0:46:1 //Clear field: DELETE (KeyDown)
2:1664:1:190:1 //Clear field (IT Style): Shift+. (KeyDown)
-2:1059:2:46:1 //Clear row and step: Ctrl+DELETE (KeyDown)
+2:1059:2:46:5 //Clear row and step: Ctrl+DELETE (KeyDown|KeyHold)
2:1665:1:46:5 //Clear field and step (IT Style): Shift+DELETE (KeyDown|KeyHold)
2:1061:0:8:5 //Delete rows: BACKSPACE (KeyDown|KeyHold)
2:1377:2:8:5 //Delete all rows: Ctrl+BACKSPACE (KeyDown|KeyHold)
-2:1378:0:45:1 //Insert Row: INSERT (KeyDown)
-2:1379:2:45:1 //Insert All Rows: Ctrl+INSERT (KeyDown)
+2:1378:0:45:5 //Insert Row: INSERT (KeyDown|KeyHold)
+2:1379:2:45:5 //Insert All Rows: Ctrl+INSERT (KeyDown|KeyHold)
2:1055:0:109:5 //Previous pattern: NUM SUB (KeyDown|KeyHold)
2:1054:0:107:5 //Next pattern: NUM PLUS (KeyDown|KeyHold)
@@ -120,9 +121,9 @@
3:1070:0:85:1 //Base octave F#: U (KeyDown)
3:1071:0:73:1 //Base octave G: I (KeyDown)
3:1072:0:79:1 //Base octave G#: O (KeyDown)
-3:1073:0:80:1 //Base octave +1 A: P (KeyDown)
-3:1074:0:219:1 //Base octave +1 A#: [ (KeyDown)
-3:1075:0:221:1 //Base octave +1 B: ] (KeyDown)
+3:1073:0:80:1 //Base octave A: P (KeyDown)
+3:1074:0:219:1 //Base octave A#: [ (KeyDown)
+3:1075:0:221:1 //Base octave B: ] (KeyDown)
3:1076:0:65:1 //Base octave +1 C: A (KeyDown)
3:1077:0:83:1 //Base octave +1 C#: S (KeyDown)
3:1078:0:68:1 //Base octave +1 D: D (KeyDown)
@@ -132,9 +133,9 @@
3:1082:0:74:1 //Base octave +1 F#: J (KeyDown)
3:1083:0:75:1 //Base octave +1 G: K (KeyDown)
3:1084:0:76:1 //Base octave +1 G#: L (KeyDown)
-3:1085:0:186:1 //Base octave +2 A: ; (KeyDown)
-3:1086:0:222:1 //Base octave +2 A#: # (KeyDown)
-3:1087:0:220:1 //Base octave +2 B: \ (KeyDown)
+3:1085:0:186:1 //Base octave +1 A: ; (KeyDown)
+3:1086:0:222:1 //Base octave +1 A#: ' (KeyDown)
+3:1087:0:220:1 //Base octave +1 B: \ (KeyDown)
3:1088:0:90:1 //Base octave +2 C: Z (KeyDown)
3:1089:0:88:1 //Base octave +2 C#: X (KeyDown)
3:1090:0:67:1 //Base octave +2 D: C (KeyDown)
@@ -144,7 +145,7 @@
3:1094:0:77:1 //Base octave +2 F#: M (KeyDown)
3:1095:0:188:1 //Base octave +2 G: , (KeyDown)
3:1096:0:190:1 //Base octave +2 G#: . (KeyDown)
-3:1097:0:191:1 //Base octave +3 A: / (KeyDown)
+3:1097:0:191:1 //Base octave +2 A: / (KeyDown)
3:1212:0:48:1 //Set octave 0: 0 (KeyDown)
3:1212:0:96:1 //Set octave 0: NUM 0 (KeyDown)
3:1213:0:49:1 //Set octave 1: 1 (KeyDown)
@@ -166,10 +167,11 @@
3:1221:0:57:1 //Set octave 9: 9 (KeyDown)
3:1221:0:105:1 //Set octave 9: NUM 9 (KeyDown)
3:1316:1:16:1 //Chord Modifier: Shift (KeyDown)
-3:1200:0:192:1 //Note cut: ' (KeyDown)
-3:1201:0:187:1 //Note off: = (KeyDown)
-3:1788:1:189:1 //Parameter control(MPTm only): Shift+- (KeyDown)
-3:1789:0:189:1 //Parameter control(smooth)(MPTm only): - (KeyDown)
+3:1200:0:192:1 //Note Cut: ` (KeyDown)
+3:1201:0:187:1 //Note Off: = (KeyDown)
+3:1791:1:187:1 //Note Fade: Shift+= (KeyDown)
+3:1788:0:189:1 //Parameter control(MPTm only): - (KeyDown)
+3:1789:1:189:1 //Parameter control(smooth)(MPTm only): Shift+- (KeyDown)
//----( Pattern Context [bottom] - Ins Col (4) )------------
4:1202:0:96:1 //Set instrument digit 0: NUM 0 (KeyDown)
@@ -188,6 +190,7 @@
4:1208:0:54:1 //Set instrument digit 6: 6 (KeyDown)
4:1209:0:103:1 //Set instrument digit 7: NUM 7 (KeyDown)
4:1209:0:55:1 //Set instrument digit 7: 7 (KeyDown)
+4:1210:0:104:1 //Set instrument digit 8: NUM 8 (KeyDown)
4:1210:0:56:1 //Set instrument digit 8: 8 (KeyDown)
4:1211:0:105:1 //Set instrument digit 9: NUM 9 (KeyDown)
4:1211:0:57:1 //Set instrument digit 9: 9 (KeyDown)
@@ -210,6 +213,7 @@
5:1229:0:55:1 //Set volume digit 7: 7 (KeyDown)
5:1229:0:103:1 //Set volume digit 7: NUM 7 (KeyDown)
5:1230:0:56:1 //Set volume digit 8: 8 (KeyDown)
+5:1230:0:104:1 //Set volume digit 8: NUM 8 (KeyDown)
5:1231:0:57:1 //Set volume digit 9: 9 (KeyDown)
5:1231:0:105:1 //Set volume digit 9: NUM 9 (KeyDown)
5:1232:0:86:1 //Vol command - volume: V (KeyDown)
@@ -225,11 +229,15 @@
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: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:1666:0:191:1 //FX parameter extension command: / (KeyDown)
//----( Pattern Context [bottom] - Param Col (7) )------------
7:1247:0:48:1 //FX Param digit 0: 0 (KeyDown)
@@ -264,6 +272,7 @@
8:1383:0:8:1 //Silence sample selection: BACKSPACE (KeyDown)
8:1384:1:78:1 //Normalise Sample: Shift+N (KeyDown)
8:1385:3:65:1 //Amplify Sample: Shift+Ctrl+A (KeyDown)
+8:1385:2:77:1 //Amplify Sample: Ctrl+M (KeyDown)
8:1381:3:82:1 //Reverse sample: Shift+Ctrl+R (KeyDown)
8:1382:0:46:1 //Delete sample selection: DELETE (KeyDown)
8:1386:0:107:1 //Zoom Out: NUM PLUS (KeyDown)
@@ -278,11 +287,12 @@
9:1821:0:37:5 //Move envelope point left: LEFT (KeyDown|KeyHold)
9:1822:0:39:5 //Move envelope point right: RIGHT (KeyDown|KeyHold)
9:1823:0:38:5 //Move envelope point up: UP (KeyDown|KeyHold)
-9:1834:0:33:5 //Move envelope point up (big step): PG UP (KeyDown|KeyHold)
+9:1834:0:33:5 //Move envelope point up (big step): PGUP (KeyDown|KeyHold)
9:1824:0:40:5 //Move envelope point down: DOWN (KeyDown|KeyHold)
-9:1835:0:34:5 //Move envelope point down (big step): PG DN (KeyDown|KeyHold)
-9:1827:0:45:5 //Insert envelope point: INSERT (KeyDown|KeyHold)
-9:1828:0:46:5 //Remove envelope point: DELETE (KeyDown|KeyHold)
+9:1835:0:34:5 //Move envelope point down (big step): PGDOWN (KeyDown|KeyHold)
+9:1827:0:45:1 //Insert envelope point: INSERT (KeyDown)
+9:1828:0:46:1 //Remove envelope point: DELETE (KeyDown)
+9:1828:0:8:1 //Remove envelope point: BACKSPACE (KeyDown)
9:1829:0:36:1 //Set loop start: HOME (KeyDown)
9:1830:0:35:1 //Set loop end: END (KeyDown)
9:1831:2:36:1 //Set sustain loop start: Ctrl+HOME (KeyDown)
@@ -296,11 +306,11 @@
//----( Unknown Context (12) )------------
//----( Plugin GUI Context (13) )------------
-13:1763:2:109:5 //Previous plugin preset: Ctrl+NUM SUB (KeyDown|KeyHold)
-13:1764:2:107:5 //Next plugin preset: Ctrl+NUM PLUS (KeyDown|KeyHold)
-13:1782:0:109:5 //Plugin preset backward jump: NUM SUB (KeyDown|KeyHold)
-13:1783:0:107:5 //Plugin preset forward jump: NUM PLUS (KeyDown|KeyHold)
-13:1765:2:82:5 //Randomize plugin parameters: Ctrl+R (KeyDown|KeyHold)
+13:1763:0:37:5 //Previous plugin preset: LEFT (KeyDown|KeyHold)
+13:1764:0:39:5 //Next plugin preset: RIGHT (KeyDown|KeyHold)
+13:1782:0:38:5 //Plugin preset backward jump: UP (KeyDown|KeyHold)
+13:1783:0:40:5 //Plugin preset forward jump: DOWN (KeyDown|KeyHold)
+13:1765:2:82:1 //Randomize plugin parameters: Ctrl+R (KeyDown)
//----( General Context [top] (14) )------------
@@ -344,6 +354,6 @@
19:1816:0:57:5 //Pattern index digit 9: 9 (KeyDown|KeyHold)
19:1816:0:105:5 //Pattern index digit 9: NUM 9 (KeyDown|KeyHold)
19:1817:0:107:5 //Increase pattern index : NUM PLUS (KeyDown|KeyHold)
-19:1817:0:187:5 //Increase pattern index : + (KeyDown|KeyHold)
-19:1818:0:109:1 //Decrease pattern index: NUM SUB (KeyDown)
-19:1818:0:189:1 //Decrease pattern index: - (KeyDown)
+19:1817:0:187:5 //Increase pattern index : = (KeyDown|KeyHold)
+19:1818:0:109:5 //Decrease pattern index: NUM SUB (KeyDown|KeyHold)
+19:1818:0:189:5 //Decrease pattern index: - (KeyDown|KeyHold)
Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt 2010-01-16 23:55:23 UTC (rev 470)
+++ trunk/OpenMPT/packageTemplate/History.txt 2010-01-19 22:57:23 UTC (rev 471)
@@ -9,9 +9,9 @@
?: other
(tx XYZ): thanks to XYZ for telling us about the bug
+v1.18 (January 2010, revision 467)
+----------------------------------
---------------------
-
General tab
. <Jojo> Channel name input field was not limited properly.
Added: trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(snu).mkb
===================================================================
--- trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(snu).mkb (rev 0)
+++ trunk/OpenMPT/packageTemplate/extraKeymaps/US_mpt_classic_(snu).mkb 2010-01-19 22:57:23 UTC (rev 471)
@@ -0,0 +1,359 @@
+//-------- OpenMPT key binding definition file -------
+//-Format is: -
+//- Context:Command ID:Modifiers:Key:KeypressEventType //Comments -
+//----------------------------------------------------------------------
+version:1
+
+//----( Global Context (0) )------------
+0:1347:2:78:1 //File/New: Ctrl+N (KeyDown)
+0:1346:2:79:1 //File/Open: Ctrl+O (KeyDown)
+0:1349:2:83:1 //File/Save: Ctrl+S (KeyDown)
+0:1350:3:83:1 //File/Save As: Shift+Ctrl+S (KeyDown)
+0:1030:0:116:1 //Play song/Pause song: F5 (KeyDown)
+0:1031:0:119:1 //Pause song: F8 (KeyDown)
+0:1375:0:27:1 //Stop Song: ESC (KeyDown)
+0:1029:0:117:1 //Play song from start: F6 (KeyDown)
+0:1027:0:118:1 //Play pattern from start: F7 (KeyDown)
+0:1026:2:118:1 //Play pattern from cursor: Ctrl+F7 (KeyDown)
+0:1376:0:120:1 //Toggle Midi Record: F9 (KeyDown)
+0:1359:2:90:1 //Undo: Ctrl+Z (KeyDown)
+0:1360:2:88:1 //Cut: Ctrl+X (KeyDown)
+0:1361:2:67:1 //Copy: Ctrl+C (KeyDown)
+0:1362:2:86:1 //Paste: Ctrl+V (KeyDown)
+0:1362:1:45:1 //Paste: Shift+INSERT (KeyDown)
+0:1363:3:86:1 //Mix Paste: Shift+Ctrl+V (KeyDown)
+0:1793:1:86:5 //Paste Flood: Shift+V (KeyDown|KeyHold)
+0:1364:2:53:1 //SelectAll: Ctrl+5 (KeyDown)
+0:1365:2:70:1 //Find: Ctrl+F (KeyDown)
+0:1366:0:114:1 //Find Next: F3 (KeyDown)
+0:1021:4:71:1 //View General: Alt+G (KeyDown)
+0:1022:4:80:1 //View Pattern: Alt+P (KeyDown)
+0:1023:4:83:1 //View Samples: Alt+S (KeyDown)
+0:1024:4:78:1 //View Instruments: Alt+N (KeyDown)
+0:1025:1:120:1 //View Comments: Shift+F9 (KeyDown)
+0:1025:4:67:1 //View Comments: Alt+C (KeyDown)
+0:1368:2:113:1 //Toggle Tree View: Ctrl+F2 (KeyDown)
+0:1369:2:112:1 //View Options: Ctrl+F1 (KeyDown)
+0:1781:2:114:1 //View MIDI mapping: Ctrl+F3 (KeyDown)
+0:1370:0:112:1 //Help (to do): F1 (KeyDown)
+0:1032:2:111:5 //Previous instrument: Ctrl+NUM DIVIDE (KeyDown|KeyHold)
+0:1032:2:38:5 //Previous instrument: Ctrl+UP (KeyDown|KeyHold)
+0:1033:2:106:5 //Next instrument: Ctrl+NUMMULT (KeyDown|KeyHold)
+0:1033:2:40:5 //Next instrument: Ctrl+DOWN (KeyDown|KeyHold)
+0:1036:0:111:1 //Previous octave: NUM DIVIDE (KeyDown)
+0:1037:0:106:1 //Next octave: NUMMULT (KeyDown)
+0:1034:2:37:5 //Previous order: Ctrl+LEFT (KeyDown|KeyHold)
+0:1035:2:39:5 //Next order: Ctrl+RIGHT (KeyDown|KeyHold)
+
+//----( General Context [bottom] (1) )------------
+
+//----( Pattern Context [bottom] (2) )------------
+2:1017:0:34:5 //Jump down by measure: PGDOWN (KeyDown|KeyHold)
+2:1018:0:33:5 //Jump up by measure: PGUP (KeyDown|KeyHold)
+2:1338:4:34:5 //Jump down by beat: Alt+PGDOWN (KeyDown|KeyHold)
+2:1339:4:33:5 //Jump up by beat: Alt+PGUP (KeyDown|KeyHold)
+2:1340:6:34:5 //Snap down to beat: Ctrl+Alt+PGDOWN (KeyDown|KeyHold)
+2:1341:6:33:5 //Snap up to beat: Ctrl+Alt+PGUP (KeyDown|KeyHold)
+2:1038:0:40:5 //Navigate down by 1 row: DOWN (KeyDown|KeyHold)
+2:1039:0:38:5 //Navigate up by 1 row: UP (KeyDown|KeyHold)
+2:1691:4:40:5 //Navigate down by spacing: Alt+DOWN (KeyDown|KeyHold)
+2:1692:4:38:5 //Navigate up by spacing: Alt+UP (KeyDown|KeyHold)
+2:1040:0:37:5 //Navigate left: LEFT (KeyDown|KeyHold)
+2:1041:0:39:5 //Navigate right: RIGHT (KeyDown|KeyHold)
+2:1042:0:9:5 //Navigate to next channel: TAB (KeyDown|KeyHold)
+2:1043:1:9:5 //Navigate to previous channel: Shift+TAB (KeyDown|KeyHold)
+2:1044:0:36:1 //Go to first channel: HOME (KeyDown)
+2:1045:2:36:1 //Go to first row: Ctrl+HOME (KeyDown)
+2:1046:6:36:1 //Go to first row of first channel: Ctrl+Alt+HOME (KeyDown)
+2:1047:0:35:1 //Go to last channel: END (KeyDown)
+2:1048:2:35:1 //Go to last row: Ctrl+END (KeyDown)
+2:1049:6:35:1 //Go to last row of last channel: Ctrl+Alt+END (KeyDown)
+2:1050:1:16:1 //Selection key: Shift (KeyDown)
+2:1051:2:17:1 //Copy select key: Ctrl (KeyDown)
+2:1011:2:76:1 //Select channel / Select all: Ctrl+L (KeyDown)
+2:1663:0:122:1 //Toggle follow song: F11 (KeyDown)
+2:1003:0:13:1 //Quick copy: ENTER (KeyDown)
+2:1004:0:32:5 //Quick paste: SPACE (KeyDown|KeyHold)
+2:1001:2:32:1 //Enable recording: Ctrl+SPACE (KeyDown)
+2:1002:2:13:5 //Play row: Ctrl+ENTER (KeyDown|KeyHold)
+2:1317:4:18:1 //Set row jump on note entry: Alt (KeyDown)
+2:1685:2:9:1 //Switch to order list: Ctrl+TAB (KeyDown)
+2:1806:2:68:1 //Duplicate pattern: Ctrl+D (KeyDown)
+2:1662:6:80:1 //Toggle channel's plugin editor: Ctrl+Alt+P (KeyDown)
+2:1062:0:93:1 //Show note properties: Application (KeyDown)
+2:1772:5:80:1 //Show pattern properties window: Shift+Alt+P (KeyDown)
+2:1819:2:69:1 //Split Keyboard Settings dialog: Ctrl+E (KeyDown)
+2:1780:2:80:1 //Show playback time at current row: Ctrl+P (KeyDown)
+2:1005:0:121:1 //Mute current channel: F10 (KeyDown)
+2:1006:2:121:1 //Solo current channel: Ctrl+F10 (KeyDown)
+2:1771:6:121:1 //Unmute all channels: Ctrl+Alt+F10 (KeyDown)
+2:1786:2:82:1 //Reset channel: Ctrl+R (KeyDown)
+2:1007:2:81:5 //Transpose +1: Ctrl+Q (KeyDown|KeyHold)
+2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold)
+2:1009:3:81:5 //Transpose +12: Shift+Ctrl+Q (KeyDown|KeyHold)
+2:1010:3:65:5 //Transpose -12: Shift+Ctrl+A (KeyDown|KeyHold)
+2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown)
+2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown)
+2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown)
+2:1016:4:66:1 //Open effect visualizer: Alt+B (KeyDown)
+2:1766:2:71:1 //Go to row/channel/...: Ctrl+G (KeyDown)
+2:1013:2:73:1 //Apply current instrument: Ctrl+I (KeyDown)
+2:1660:4:69:5 //Grow selection: Alt+E (KeyDown|KeyHold)
+2:1661:4:68:5 //Shrink selection: Alt+D (KeyDown|KeyHold)
+2:1058:0:46:1 //Clear field: DELETE (KeyDown)
+2:1664:1:190:1 //Clear field (IT Style): Shift+. (KeyDown)
+2:1059:2:46:5 //Clear row and step: Ctrl+DELETE (KeyDown|KeyHold)
+2:1665:1:46:5 //Clear field and step (IT Style): Shift+DELETE (KeyDown|KeyHold)
+2:1061:0:8:5 //Delete rows: BACKSPACE (KeyDown|KeyHold)
+2:1377:2:8:5 //Delete all rows: Ctrl+BACKSPACE (KeyDown|KeyHold)
+2:1378:0:45:5 //Insert Row: INSERT (KeyDown|KeyHold)
+2:1379:2:45:5 //Insert All Rows: Ctrl+INSERT (KeyDown|KeyHold)
+2:1055:0:109:5 //Previous pattern: NUM SUB (KeyDown|KeyHold)
+2:1054:0:107:5 //Next pattern: NUM PLUS (KeyDown|KeyHold)
+
+//----( Pattern Context [bottom] - Note Col (3) )------------
+3:1064:0:81:1 //Base octave C: Q (KeyDown)
+3:1065:0:87:1 //Base octave C#: W (KeyDown)
+3:1066:0:69:1 //Base octave D: E (KeyDown)
+3:1067:0:82:1 //Base octave D#: R (KeyDown)
+3:1068:0:84:1 //Base octave E: T (KeyDown)
+3:1069:0:89:1 //Base octave F: Y (KeyDown)
+3:1070:0:85:1 //Base octave F#: U (KeyDown)
+3:1071:0:73:1 //Base octave G: I (KeyDown)
+3:1072:0:79:1 //Base octave G#: O (KeyDown)
+3:1073:0:80:1 //Base octave A: P (KeyDown)
+3:1074:0:219:1 //Base octave A#: [ (KeyDown)
+3:1075:0:221:1 //Base octave B: ] (KeyDown)
+3:1076:0:65:1 //Base octave +1 C: A (KeyDown)
+3:1077:0:83:1 //Base octave +1 C#: S (KeyDown)
+3:1078:0:68:1 //Base octave +1 D: D (KeyDown)
+3:1079:0:70:1 //Base octave +1 D#: F (KeyDown)
+3:1080:0:71:1 //Base octave +1 E: G (KeyDown)
+3:1081:0:72:1 //Base octave +1 F: H (KeyDown)
+3:1082:0:74:1 //Base octave +1 F#: J (KeyDown)
+3:1083:0:75:1 //Base octave +1 G: K (KeyDown)
+3:1084:0:76:1 //Base octave +1 G#: L (KeyDown)
+3:1085:0:186:1 //Base octave +1 A: ; (KeyDown)
+3:1086:0:222:1 //Base octave +1 A#: ' (KeyDown)
+3:1087:0:220:1 //Base octave +1 B: \ (KeyDown)
+3:1088:0:90:1 //Base octave +2 C: Z (KeyDown)
+3:1089:0:88:1 //Base octave +2 C#: X (KeyDown)
+3:1090:0:67:1 //Base octave +2 D: C (KeyDown)
+3:1091:0:86:1 //Base octave +2 D#: V (KeyDown)
+3:1092:0:66:1 //Base octave +2 E: B (KeyDown)
+3:1093:0:78:1 //Base octave +2 F: N (KeyDown)
+3:1094:0:77:1 //Base octave +2 F#: M (KeyDown)
+3:1095:0:188:1 //Base octave +2 G: , (KeyDown)
+3:1096:0:190:1 //Base octave +2 G#: . (KeyDown)
+3:1097:0:191:1 //Base octave +2 A: / (KeyDown)
+3:1212:0:48:1 //Set octave 0: 0 (KeyDown)
+3:1212:0:96:1 //Set octave 0: NUM 0 (KeyDown)
+3:1213:0:49:1 //Set octave 1: 1 (KeyDown)
+3:1213:0:97:1 //Set octave 1: NUM 1 (KeyDown)
+3:1214:0:50:1 //Set octave 2: 2 (KeyDown)
+3:1214:0:98:1 //Set octave 2: NUM 2 (KeyDown)
+3:1215:0:51:1 //Set octave 3: 3 (KeyDown)
+3:1215:0:99:1 //Set octave 3: NUM 3 (KeyDown)
+3:1216:0:52:1 //Set octave 4: 4 (KeyDown)
+3:1216:0:100:1 //Set octave 4: NUM 4 (KeyDown)
+3:1217:0:53:1 //Set octave 5: 5 (KeyDown)
+3:1217:0:101:1 //Set octave 5: NUM 5 (KeyDown)
+3:1218:0:54:1 //Set octave 6: 6 (KeyDown)
+3:1218:0:102:1 //Set octave 6: NUM 6 (KeyDown)
+3:1219:0:55:1 //Set octave 7: 7 (KeyDown)
+3:1219:0:103:1 //Set octave 7: NUM 7 (KeyDown)
+3:1220:0:56:1 //Set octave 8: 8 (KeyDown)
+3:1220:0:104:1 //Set octave 8: NUM 8 (KeyDown)
+3:1221:0:57:1 //Set octave 9: 9 (KeyDown)
+3:1221:0:105:1 //Set octave 9: NUM 9 (KeyDown)
+3:1316:1:16:1 //Chord Modifier: Shift (KeyDown)
+3:1200:0:192:1 //Note Cut: ` (KeyDown)
+3:1201:0:187:1 //Note Off: = (KeyDown)
+3:1791:1:187:1 //Note Fade: Shift+= (KeyDown)
+3:1788:0:189:1 //Parameter control(MPTm only): - (KeyDown)
+3:1789:1:189:1 //Parameter control(smooth)(MPTm only): Shift+- (KeyDown)
+
+//----( Pattern Context [bottom] - Ins Col (4) )------------
+4:1202:0:96:1 //Set instrument digit 0: NUM 0 (KeyDown)
+4:1202:0:48:1 //Set instrument digit 0: 0 (KeyDown)
+4:1203:0:97:1 //Set instrument digit 1: NUM 1 (KeyDown)
+4:1203:0:49:1 //Set instrument digit 1: 1 (KeyDown)
+4:1204:0:98:1 //Set instrument digit 2: NUM 2 (KeyDown)
+4:1204:0:50:1 //Set instrument digit 2: 2 (KeyDown)
+4:1205:0:99:1 //Set instrument digit 3: NUM 3 (KeyDown)
+4:1205:0:51:1 //Set instrument digit 3: 3 (KeyDown)
+4:1206:0:100:1 //Set instrument digit 4: NUM 4 (KeyDown)
+4:1206:0:52:1 //Set instrument digit 4: 4 (KeyDown)
+4:1207:0:101:1 //Set instrument digit 5: NUM 5 (KeyDown)
+4:1207:0:53:1 //Set instrument digit 5: 5 (KeyDown)
+4:1208:0:102:1 //Set instrument digit 6: NUM 6 (KeyDown)
+4:1208:0:54:1 //Set instrument digit 6: 6 (KeyDown)
+4:1209:0:103:1 //Set instrument digit 7: NUM 7 (KeyDown)
+4:1209:0:55:1 //Set instrument digit 7: 7 (KeyDown)
+4:1210:0:104:1 //Set instrument digit 8: NUM 8 (KeyDown)
+4:1210:0:56:1 //Set instrument digit 8: 8 (KeyDown)
+4:1211:0:105:1 //Set instrument digit 9: NUM 9 (KeyDown)
+4:1211:0:57:1 //Set instrument digit 9: 9 (KeyDown)
+
+//----( Pattern Context [bottom] - Vol Col (5) )------------
+5:1222:0:48:1 //Set volume digit 0: 0 (KeyDown)
+5:1222:0:96:1 //Set volume digit 0: NUM 0 (KeyDown)
+5:1223:0:49:1 //Set volume digit 1: 1 (KeyDown)
+5:1223:0:97:1 //Set volume digit 1: NUM 1 (KeyDown)
+5:1224:0:50:1 //Set volume digit 2: 2 (KeyDown)
+5:1224:0:98:1 //Set volume digit 2: NUM 2 (KeyDown)
+5:1225:0:51:1 //Set volume digit 3: 3 (KeyDown)
+5:1225:0:99:1 //Set volume digit 3: NUM 3 (KeyDown)
+5:1226:0:52:1 //Set volume digit 4: 4 (KeyDown)
+5:1226:0:100:1 //Set volume digit 4: NUM 4 (KeyDown)
+5:1227:0:53:1 //Set volume digit 5: 5 (KeyDown)
+5:1227:0:101:1 //Set volume digit 5: NUM 5 (KeyDown)
+5:1228:0:54:1 //Set volume digit 6: 6 (KeyDown)
+5:1228:0:102:1 //Set volume digit 6: NUM 6 (KeyDown)
+5:1229:0:55:1 //Set volume digit 7: 7 (KeyDown)
+5:1229:0:103:1 //Set volume digit 7: NUM 7 (KeyDown)
+5:1230:0:56:1 //Set volume digit 8: 8 (KeyDown)
+5:1230:0:104:1 //Set volume digit 8: NUM 8 (KeyDown)
+5:1231:0:57:1 //Set volume digit 9: 9 (KeyDown)
+5:1231:0:105:1 //Set volume digit 9: NUM 9 (KeyDown)
+5:1232:0:86:1 //Vol command - volume: V (KeyDown)
+5:1233:0:80:1 //Vol command - pan: P (KeyDown)
+5:1234:0:67:1 //Vol command - vol slide up: C (KeyDown)
+5:1235:0:68:1 //Vol command - vol slide down: D (KeyDown)
+5:1236:0:65:1 //Vol command - vol fine slide up: A (KeyDown)
+5:1237:0:66:1 //Vol command - vol fine slide down: B (KeyDown)
+5:1238:0:85:1 //Vol command - vibrato speed: U (KeyDown)
+5:1239:0:72:1 //Vol command - vibrato: H (KeyDown)
+5:1240:0:76:1 //Vol command - XM pan left: L (KeyDown)
+5:1241:0:82:1 //Vol command - XM pan right: R (KeyDown)
+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: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:1666:0:191:1 //FX parameter extension command: / (KeyDown)
+
+//----( Pattern Context [bottom] - Param Col (7) )------------
+7:1247:0:48:1 //FX Param digit 0: 0 (KeyDown)
+7:1247:0:96:1 //FX Param digit 0: NUM 0 (KeyDown)
+7:1248:0:49:1 //FX Param digit 1: 1 (KeyDown)
+7:1248:0:97:1 //FX Param digit 1: NUM 1 (KeyDown)
+7:1249:0:50:1 //FX Param digit 2: 2 (KeyDown)
+7:1249:0:98:1 //FX Param digit 2: NUM 2 (KeyDown)
+7:1250:0:51:1 //FX Param digit 3: 3 (KeyDown)
+7:1250:0:99:1 //FX Param digit 3: NUM 3 (KeyDown)
+7:1251:0:52:1 //FX Param digit 4: 4 (KeyDown)
+7:1251:0:100:1 //FX Param digit 4: NUM 4 (KeyDown)
+7:1252:0:53:1 //FX Param digit 5: 5 (KeyDown)
+7:1252:0:101:1 //FX Param digit 5: NUM 5 (KeyDown)
+7:1253:0:54:1 //FX Param digit 6: 6 (KeyDown)
+7:1253:0:102:1 //FX Param digit 6: NUM 6 (KeyDown)
+7:1254:0:55:1 //FX Param digit 7: 7 (KeyDown)
+7:1254:0:103:1 //FX Param digit 7: NUM 7 (KeyDown)
+7:1255:0:56:1 //FX Param digit 8: 8 (KeyDown)
+7:1255:0:104:1 //FX Param digit 8: NUM 8 (KeyDown)
+7:1256:0:57:1 //FX Param digit 9: 9 (KeyDown)
+7:1256:0:105:1 //FX Param digit 9: NUM 9 (KeyDown)
+7:1257:0:65:1 //FX Param digit A: A (KeyDown)
+7:1258:0:66:1 //FX Param digit B: B (KeyDown)
+7:1259:0:67:1 //FX Param digit C: C (KeyDown)
+7:1260:0:68:1 //FX Param digit D: D (KeyDown)
+7:1261:0:69:1 //FX Param digit E: E (KeyDown)
+7:1262:0:70:1 //FX Param digit F: F (KeyDown)
+
+//----( Sample Context [bottom] (8) )------------
+8:1380:2:84:1 //Trim sample around loop points: Ctrl+T (KeyDown)
+8:1383:0:8:1 //Silence sample selection: BACKSPACE (KeyDown)
+8:1384:1:78:1 //Normalise Sample: Shift+N (KeyDown)
+8:1385:3:65:1 //Amplify Sample: Shift+Ctrl+A (KeyDown)
+8:1385:2:77:1 //Amplify Sample: Ctrl+M (KeyDown)
+8:1381:3:82:1 //Reverse sample: Shift+Ctrl+R (KeyDown)
+8:1382:0:46:1 //Delete sample selection: DELETE (KeyDown)
+8:1386:0:107:1 //Zoom Out: NUM PLUS (KeyDown)
+8:1387:0:109:1 //Zoom In: NUM SUB (KeyDown)
+8:1784:2:73:1 //Invert sample phase: Ctrl+I (KeyDown)
+8:1785:2:85:1 //Signed/Unsigned conversion: Ctrl+U (KeyDown)
+8:1790:2:68:1 //Remove DC Offset: Ctrl+D (KeyDown)
+
+//----( Instrument Context [bottom] (9) )------------
+9:1825:1:9:5 //Select previous envelope point: Shift+TAB (KeyDown|KeyHold)
+9:1826:0:9:5 //Select next envelope point: TAB (KeyDown|KeyHold)
+9:1821:0:37:5 //Move envelope point left: LEFT (KeyDown|KeyHold)
+9:1822:0:39:5 //Move envelope point right: RIGHT (KeyDown|KeyHold)
+9:1823:0:38:5 //Move envelope point up: UP (KeyDown|KeyHold)
+9:1834:0:33:5 //Move envelope point up (big step): PGUP (KeyDown|KeyHold)
+9:1824:0:40:5 //Move envelope point down: DOWN (KeyDown|KeyHold)
+9:1835:0:34:5 //Move envelope point down (big step): PGDOWN (KeyDown|KeyHold)
+9:1827:0:45:1 //Insert envelope point: INSERT (KeyDown)
+9:1828:0:46:1 //Remove envelope point: DELETE (KeyDown)
+9:1828:0:8:1 //Remove envelope point: BACKSPACE (KeyDown)
+9:1829:0:36:1 //Set loop start: HOME (KeyDown)
+9:1830:0:35:1 //Set loop end: END (KeyDown)
+9:1831:2:36:1 //Set sustain loop start: Ctrl+HOME (KeyDown)
+9:1832:2:35:1 //Set sustain loop end: Ctrl+END (KeyDown)
+9:1833:2:82:1 //Toggle release node: Ctrl+R (KeyDown)
+
+//----( Comments Context [bottom] (10) )------------
+
+//----( Unknown Context (11) )------------
+
+//----( Unknown Context (12) )------------
+
+//----( Plugin GUI Context (13) )------------
+13:1763:0:37:5 //Previous plugin preset: LEFT (KeyDown|KeyHold)
+13:1764:0:39:5 //Next plugin preset: RIGHT (KeyDown|KeyHold)
+13:1782:0:38:5 //Plugin preset backward jump: UP (KeyDown|KeyHold)
+13:1783:0:40:5 //Plugin preset forward jump: DOWN (KeyDown|KeyHold)
+13:1765:2:82:1 //Randomize plugin parameters: Ctrl+R (KeyDown)
+
+//----( General Context [top] (14) )------------
+
+//----( Pattern Context [top] (15) )------------
+
+//----( Sample Context [top] (16) )------------
+
+//----( Instrument Context [top] (17) )------------
+
+//----( Comments Context [top] (18) )------------
+
+//----( Orderlist (19) )------------
+19:1802:0:46:5 //Delete Order: DELETE (KeyDown|KeyHold)
+19:1803:0:45:5 //Insert Order: INSERT (KeyDown|KeyHold)
+19:1804:0:13:5 //Edit Pattern: ENTER (KeyDown|KeyHold)
+19:1805:0:9:5 //Switch to pattern editor: TAB (KeyDown|KeyHold)
+19:1794:0:37:5 //Previous Order: LEFT (KeyDown|KeyHold)
+19:1794:0:38:5 //Previous Order: UP (KeyDown|KeyHold)
+19:1795:0:39:5 //Next Order: RIGHT (KeyDown|KeyHold)
+19:1795:0:40:5 //Next Order: DOWN (KeyDown|KeyHold)
+19:1796:0:36:5 //First Order: HOME (KeyDown|KeyHold)
+19:1797:0:35:5 //Last Order: END (KeyDown|KeyHold)
+19:1807:0:48:5 //Pattern index digit 0: 0 (KeyDown|KeyHold)
+19:1807:0:96:5 //Pattern index digit 0: NUM 0 (KeyDown|KeyHold)
+19:1808:0:49:5 //Pattern index digit 1: 1 (KeyDown|KeyHold)
+19:1808:0:97:5 //Pattern index digit 1: NUM 1 (KeyDown|KeyHold)
+19:1809:0:50:5 //Pattern index digit 2: 2 (KeyDown|KeyHold)
+19:1809:0:98:5 //Pattern index digit 2: NUM 2 (KeyDown|KeyHold)
+19:1810:0:51:5 //Pattern index digit 3: 3 (KeyDown|KeyHold)
+19:1810:0:99:5 //Pattern index digit 3: NUM 3 (KeyDown|KeyHold)
+19:1811:0:52:5 //Pattern index digit 4: 4 (KeyDown|KeyHold)
+19:1811:0:100:5 //Pattern index digit 4: NUM 4 (KeyDown|KeyHold)
+19:1812:0:53:5 //Pattern index digit 5: 5 (KeyDown|KeyHold)
+19:1812:0:101:5 //Pattern index digit 5: NUM 5 (KeyDown|KeyHold)
+19:1813:0:54:5 //Pattern index digit 6: 6 (KeyDown|KeyHold)
+19:1813:0:102:5 //Pattern index digit 6: NUM 6 (KeyDown|KeyHold)
+19:1814:0:55:5 //Pattern index digit 7: 7 (KeyDown|KeyHold)
+19:1814:0:103:5 //Pattern index digit 7: NUM 7 (KeyDown|KeyHold)
+19:1815:0:56:5 //Pattern index digit 8: 8 (KeyDown|KeyHold)
+19:1815:0:104:5 //Pattern index digit 8: NUM 8 (KeyDown|KeyHold)
+19:1816:0:57:5 //Pattern index digit 9: 9 (KeyDown|KeyHold)
+19:1816:0:105:5 //Pattern index digit 9: NUM 9 (KeyDown|KeyHold)
+19:1817:0:107:5 //Increase pattern index : NUM PLUS (KeyDown|KeyHold)
+19:1817:0:187:5 //Increase pattern index : = (KeyDown|KeyHold)
+19:1818:0:109:5 //Decrease pattern index: NUM SUB (KeyDown|KeyHold)
+19:1818:0:189:5 //Decrease pattern index: - (KeyDown|KeyHold)
Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/dvorak_(snu).mkb
===================================================================
--- trunk/OpenMPT/packageTemplate/extraKeymaps/dvorak_(snu).mkb 2010-01-16 23:55:23 UTC (rev 470)
+++ trunk/OpenMPT/packageTemplate/extraKeymaps/dvorak_(snu).mkb 2010-01-19 22:57:23 UTC (rev 471)
@@ -8,51 +8,60 @@
0:1347:2:78:1 //File/New: Ctrl+N (KeyDown)
0:1346:2:79:1 //File/Open: Ctrl+O (KeyDown)
0:1349:2:83:1 //File/Save: Ctrl+S (KeyDown)
-0:1030:2:119:1 //Play song/Pause song: Ctrl+F8 (KeyDown)
+0:1350:6:83:1 //File/Save As: Ctrl+Alt+S (KeyDown)
+0:1030:0:116:1 //Play song/Pause song: F5 (KeyDown)
0:1031:0:119:1 //Pause song: F8 (KeyDown)
0:1375:0:27:1 //Stop Song: ESC (KeyDown)
-0:1029:0:116:5 //Play song from start: F5 (KeyDown|KeyHold)
-0:1028:0:118:5 //Play song from cursor: F7 (KeyDown|KeyHold)
-0:1027:0:117:5 //Play pattern from start: F6 (KeyDown|KeyHold)
-0:1026:2:117:5 //Play pattern from cursor: Ctrl+F6 (KeyDown|KeyHold)
-0:1376:2:120:1 //Toggle Midi Record: Ctrl+F9 (KeyDown)
+0:1029:0:117:1 //Play song from start: F6 (KeyDown)
+0:1027:0:118:1 //Play pattern from start: F7 (KeyDown)
+0:1026:2:118:1 //Play pattern from cursor: Ctrl+F7 (KeyDown)
+0:1376:0:120:1 //Toggle Midi Record: F9 (KeyDown)
0:1359:2:90:1 //Undo: Ctrl+Z (KeyDown)
0:1360:2:88:1 //Cut: Ctrl+X (KeyDown)
0:1361:2:67:1 //Copy: Ctrl+C (KeyDown)
0:1362:2:86:1 //Paste: Ctrl+V (KeyDown)
-0:1364:2:65:1 //SelectAll: Ctrl+A (KeyDown)
+0:1362:1:45:1 //Paste: Shift+INSERT (KeyDown)
+0:1363:6:86:1 //Mix Paste: Ctrl+Alt+V (KeyDown)
+0:1793:1:86:5 //Paste Flood: Shift+V (KeyDown|KeyHold)
+0:1364:2:53:1 //SelectAll: Ctrl+5 (KeyDown)
0:1365:2:70:1 //Find: Ctrl+F (KeyDown)
-0:1366:2:114:1 //Find Next: Ctrl+F3 (KeyDown)
-0:1021:0:122:1 //View General: F11 (KeyDown)
-0:1022:0:113:1 //View Pattern: F2 (KeyDown)
-0:1023:0:114:1 //View Samples: F3 (KeyDown)
-0:1024:0:115:1 //View Instruments: F4 (KeyDown)
+0:1366:0:114:1 //Find Next: F3 (KeyDown)
+0:1021:4:71:1 //View General: Alt+G (KeyDown)
+0:1022:4:80:1 //View Pattern: Alt+P (KeyDown)
+0:1023:4:83:1 //View Samples: Alt+S (KeyDown)
+0:1024:4:78:1 //View Instruments: Alt+N (KeyDown)
0:1025:1:120:1 //View Comments: Shift+F9 (KeyDown)
+0:1025:4:67:1 //View Comments: Alt+C (KeyDown)
0:1368:2:113:1 //Toggle Tree View: Ctrl+F2 (KeyDown)
+0:1369:2:112:1 //View Options: Ctrl+F1 (KeyDown)
+0:1781:2:114:1 //View MIDI mapping: Ctrl+F3 (KeyDown)
+0:1370:0:112:1 //Help (to do): F1 (KeyDown)
+0:1032:2:111:5 //Previous instrument: Ctrl+NUM DIVIDE (KeyDown|KeyHold)
0:1032:2:38:5 //Previous instrument: Ctrl+UP (KeyDown|KeyHold)
+0:1033:2:106:5 //Next instrument: Ctrl+NUMMULT (KeyDown|KeyHold)
0:1033:2:40:5 //Next instrument: Ctrl+DOWN (KeyDown|KeyHold)
-0:1036:0:111:5 //Previous octave: NUM DIVIDE (KeyDown|KeyHold)
-0:1037:0:106:5 //Next octave: NUMMULT (KeyDown|KeyHold)
+0:1036:0:111:1 //Previous octave: NUM DIVIDE (KeyDown)
+0:1037:0:106:1 //Next octave: NUMMULT (KeyDown)
0:1034:2:37:5 //Previous order: Ctrl+LEFT (KeyDown|KeyHold)
0:1035:2:39:5 //Next order: Ctrl+RIGHT (KeyDown|KeyHold)
//----( General Context [bottom] (1) )------------
//----( Pattern Context [bottom] (2) )------------
-2:1017:4:34:5 //Jump down by measure: Alt+PGDOWN (KeyDown|KeyHold)
-2:1018:4:33:5 //Jump up by measure: Alt+PGUP (KeyDown|KeyHold)
-2:1338:0:34:5 //Jump down by beat: PGDOWN (KeyDown|KeyHold)
-2:1339:0:33:5 //Jump up by beat: PGUP (KeyDown|KeyHold)
-2:1019:2:34:5 //Snap down to measure: Ctrl+PGDOWN (KeyDown|KeyHold)
-2:1020:2:33:5 //Snap up to measure: Ctrl+PGUP (KeyDown|KeyHold)
+2:1017:0:34:5 //Jump down by measure: PGDOWN (KeyDown|KeyHold)
+2:1018:0:33:5 //Jump up by measure: PGUP (KeyDown|KeyHold)
+2:1338:4:34:5 //Jump down by beat: Alt+PGDOWN (KeyDown|KeyHold)
+2:1339:4:33:5 //Jump up by beat: Alt+PGUP (KeyDown|KeyHold)
2:1340:6:34:5 //Snap down to beat: Ctrl+Alt+PGDOWN (KeyDown|KeyHold)
2:1341:6:33:5 //Snap up to beat: Ctrl+Alt+PGUP (KeyDown|KeyHold)
2:1038:0:40:5 //Navigate down by 1 row: DOWN (KeyDown|KeyHold)
2:1039:0:38:5 //Navigate up by 1 row: UP (KeyDown|KeyHold)
+2:1691:4:40:5 //Navigate down by spacing: Alt+DOWN (KeyDown|KeyHold)
+2:1692:4:38:5 //Navigate up by spacing: Alt+UP (KeyDown|KeyHold)
2:1040:0:37:5 //Navigate left: LEFT (KeyDown|KeyHold)
2:1041:0:39:5 //Navigate right: RIGHT (KeyDown|KeyHold)
2:1042:0:9:5 //Navigate to next channel: TAB (KeyDown|KeyHold)
-2:1043:2:9:5 //Navigate to previous channel: Ctrl+TAB (KeyDown|KeyHold)
+2:1043:1:9:5 //Navigate to previous channel: Shift+TAB (KeyDown|KeyHold)
2:1044:0:36:1 //Go to first channel: HOME (KeyDown)
2:1045:2:36:1 //Go to first row: Ctrl+HOME (KeyDown)
2:1046:6:36:1 //Go to first row of first channel: Ctrl+Alt+HOME (KeyDown)
@@ -60,93 +69,109 @@
2:1048:2:35:1 //Go to last row: Ctrl+END (KeyDown)
2:1049:6:35:1 //Go to last row of last channel: Ctrl+Alt+END (KeyDown)
2:1050:1:16:1 //Selection key: Shift (KeyDown)
-2:1011:4:76:1 //Select channel / Select all: Alt+L (KeyDown)
+2:1051:2:17:1 //Copy select key: Ctrl (KeyDown)
+2:1011:2:76:1 //Select channel / Select all: Ctrl+L (KeyDown)
+2:1663:0:122:1 //Toggle follow song: F11 (KeyDown)
2:1003:0:13:1 //Quick copy: ENTER (KeyDown)
-2:1004:0:32:1 //Quick paste: SPACE (KeyDown)
-2:1001:1:120:1 //Enable recording: Shift+F9 (KeyDown)
-2:1002:0:104:5 //Play row: NUM 8 (KeyDown|KeyHold)
+2:1004:0:32:5 //Quick paste: SPACE (KeyDown|KeyHold)
+2:1001:2:32:1 //Enable recording: Ctrl+SPACE (KeyDown)
2:1002:2:13:5 //Play row: Ctrl+ENTER (KeyDown|KeyHold)
2:1317:4:18:1 //Set row jump on note entry: Alt (KeyDown)
+2:1685:2:9:1 //Switch to order list: Ctrl+TAB (KeyDown)
+2:1806:2:68:1 //Duplicate pattern: Ctrl+D (KeyDown)
+2:1662:6:80:1 //Toggle channel's plugin editor: Ctrl+Alt+P (KeyDown)
2:1062:0:93:1 //Show note properties: Application (KeyDown)
-2:1063:2:93:1 //Show context (right-click) menu: Ctrl+Application (KeyDown)
-2:1005:0:120:1 //Mute current channel: F9 (KeyDown)
-2:1006:0:121:1 //Solo current channel: F10 (KeyDown)
-2:1007:4:81:5 //Transpose +1: Alt+Q (KeyDown|KeyHold)
-2:1008:4:65:5 //Transpose -1: Alt+A (KeyDown|KeyHold)
-2:1009:6:81:5 //Transpose +12: Ctrl+Alt+Q (KeyDown|KeyHold)
+2:1772:5:80:1 //Show pattern properties window: Shift+Alt+P (KeyDown)
+2:1819:2:69:1 //Split Keyboard Settings dialog: Ctrl+E (KeyDown)
+2:1780:2:80:1 //Show playback time at current row: Ctrl+P (KeyDown)
+2:1005:0:121:1 //Mute current channel: F10 (KeyDown)
+2:1006:2:121:1 //Solo current channel: Ctrl+F10 (KeyDown)
+2:1771:6:121:1 //Unmute all channels: Ctrl+Alt+F10 (KeyDown)
+2:1786:2:82:1 //Reset channel: Ctrl+R (KeyDown)
+2:1007:2:222:5 //Transpose +1: Ctrl+' (KeyDown|KeyHold)
+2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold)
+2:1009:6:222:5 //Transpose +12: Ctrl+Alt+' (KeyDown|KeyHold)
2:1010:6:65:5 //Transpose -12: Ctrl+Alt+A (KeyDown|KeyHold)
-2:1012:4:74:1 //Amplify selection: Alt+J (KeyDown)
-2:1014:4:73:1 //Interpolate volume: Alt+I (KeyDown)
-2:1015:4:88:1 //Interpolate effect: Alt+X (KeyDown)
+2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown)
+2:1014:2:74:1 //Interpolate volume: Ctrl+J (KeyDown)
+2:1015:2:75:1 //Interpolate effect: Ctrl+K (KeyDown)
2:1016:4:66:1 //Open effect visualizer: Alt+B (KeyDown)
-2:1013:4:83:1 //Apply current instrument: Alt+S (KeyDown)
-2:1664:0:46:1 //Clear field (IT Style): DELETE (KeyDown)
-2:1059:2:46:1 //Clear row and step: Ctrl+DELETE (KeyDown)
-2:1060:2:110:1 //Clear field and step: Ctrl+NUM DECIMAL (KeyDown)
+2:1766:2:71:1 //Go to row/channel/...: Ctrl+G (KeyDown)
+2:1013:2:73:1 //Apply current instrument: Ctrl+I (KeyDown)
+2:1660:4:69:5 //Grow selection: Alt+E (KeyDown|KeyHold)
+2:1661:4:68:5 //Shrink selection: Alt+D (KeyDown|KeyHold)
+2:1058:0:46:1 //Clear field: DELETE (KeyDown)
+2:1664:1:190:1 //Clear field (IT Style): Shift+. (KeyDown)
+2:1059:2:46:5 //Clear row and step: Ctrl+DELETE (KeyDown|KeyHold)
+2:1665:1:46:5 //Clear field and step (IT Style): Shift+DELETE (KeyDown|KeyHold)
2:1061:0:8:5 //Delete rows: BACKSPACE (KeyDown|KeyHold)
2:1377:2:8:5 //Delete all rows: Ctrl+BACKSPACE (KeyDown|KeyHold)
-2:1378:0:45:1 //Insert Row: INSERT (KeyDown)
-2:1379:2:45:1 //Insert All Rows: Ctrl+INSERT (KeyDown)
-2:1055:0:109:1 //Previous pattern: NUM SUB (KeyDown)
-2:1054:0:107:1 //Next pattern: NUM PLUS (KeyDown)
+2:1378:0:45:5 //Insert Row: INSERT (KeyDown|KeyHold)
+2:1379:2:45:5 //Insert All Rows: Ctrl+INSERT (KeyDown|KeyHold)
+2:1055:0:109:5 //Previous pattern: NUM SUB (KeyDown|KeyHold)
+2:1054:0:107:5 //Next pattern: NUM PLUS (KeyDown|KeyHold)
//----( Pattern Context [bottom] - Note Col (3) )------------
-3:1064:0:222:5 //Base octave C: ' (KeyDown|KeyHold)
-3:1065:0:188:5 //Base octave C#: , (KeyDown|KeyHold)
-3:1066:0:190:5 //Base octave D: . (KeyDown|KeyHold)
-3:1067:0:80:5 //Base octave D#: P (KeyDown|KeyHold)
-3:1068:0:89:5 //Base octave E: Y (KeyDown|KeyHold)
-3:1069:0:70:5 //Base octave F: F (KeyDown|KeyHold)
-3:1070:0:71:5 //Base octave F#: G (KeyDown|KeyHold)
-3:1071:0:67:5 //Base octave G: C (KeyDown|KeyHold)
-3:1072:0:82:5 //Base octave G#: R (KeyDown|KeyHold)
-3:1073:0:76:5 //Base octave +1 A: L (KeyDown|KeyHold)
-3:1074:0:191:5 //Base octave +1 A#: / (KeyDown|KeyHold)
-3:1075:0:187:5 //Base octave +1 B: = (KeyDown|KeyHold)
-3:1076:0:65:5 //Base octave +1 C: A (KeyDown|KeyHold)
-3:1077:0:79:5 //Base octave +1 C#: O (KeyDown|KeyHold)
-3:1078:0:69:5 //Base octave +1 D: E (KeyDown|KeyHold)
-3:1079:0:85:5 //Base octave +1 D#: U (KeyDown|KeyHold)
-3:1080:0:73:5 //Base octave +1 E: I (KeyDown|KeyHold)
-3:1081:0:68:5 //Base octave +1 F: D (KeyDown|KeyHold)
-3:1082:0:72:5 //Base octave +1 F#: H (KeyDown|KeyHold)
-3:1083:0:84:5 //Base octave +1 G: T (KeyDown|KeyHold)
-3:1084:0:78:5 //Base octave +1 G#: N (KeyDown|KeyHold)
-3:1085:0:83:5 //Base octave +2 A: S (KeyDown|KeyHold)
-3:1086:0:189:5 //Base octave +2 A#: - (KeyDown|KeyHold)
-3:1087:0:220:5 //Base octave +2 B: \ (KeyDown|KeyHold)
-3:1088:0:186:5 //Base octave +2 C: ; (KeyDown|KeyHold)
-3:1089:0:81:5 //Base octave +2 C#: Q (KeyDown|KeyHold)
-3:1090:0:74:5 //Base octave +2 D: J (KeyDown|KeyHold)
-3:1091:0:75:5 //Base octave +2 D#: K (KeyDown|KeyHold)
-3:1092:0:88:5 //Base octave +2 E: X (KeyDown|KeyHold)
-3:1093:0:66:5 //Base octave +2 F: B (KeyDown|KeyHold)
-3:1094:0:77:5 //Base octave +2 F#: M (KeyDown|KeyHold)
-3:1095:0:87:5 //Base octave +2 G: W (KeyDown|KeyHold)
-3:1096:0:86:5 //Base octave +2 G#: V (KeyDown|KeyHold)
-3:1097:0:90:5 //Base octave +3 A: Z (KeyDown|KeyHold)
+3:1064:0:222:1 //Base octave C: ' (KeyDown)
+3:1065:0:188:1 //Base octave C#: , (KeyDown)
+3:1066:0:190:1 //Base octave D: . (KeyDown)
+3:1067:0:80:1 //Base octave D#: P (KeyDown)
+3:1068:0:89:1 //Base octave E: Y (KeyDown)
+3:1069:0:70:1 //Base octave F: F (KeyDown)
+3:1070:0:71:1 //Base octave F#: G (KeyDown)
+3:1071:0:67:1 //Base octave G: C (KeyDown)
+3:1072:0:82:1 //Base octave G#: R (KeyDown)
+3:1073:0:76:1 //Base octave A: L (KeyDown)
+3:1074:0:191:1 //Base octave A#: / (KeyDown)
+3:1075:0:187:1 //Base octave B: = (KeyDown)
+3:1076:0:65:1 //Base octave +1 C: A (KeyDown)
+3:1077:0:79:1 //Base octave +1 C#: O (KeyDown)
+3:1078:0:69:1 //Base octave +1 D: E (KeyDown)
+3:1079:0:85:1 //Base octave +1 D#: U (KeyDown)
+3:1080:0:73:1 //Base octave +1 E: I (KeyDown)
+3:1081:0:68:1 //Base octave +1 F: D (KeyDown)
+3:1082:0:72:1 //Base octave +1 F#: H (KeyDown)
+3:1083:0:84:1 //Base octave +1 G: T (KeyDown)
+3:1084:0:78:1 //Base octave +1 G#: N (KeyDown)
+3:1085:0:83:1 //Base octave +1 A: S (KeyDown)
+3:1086:0:189:1 //Base octave +1 A#: - (KeyDown)
+3:1087:0:220:1 //Base octave +1 B: \ (KeyDown)
+3:1088:0:186:1 //Base octave +2 C: ; (KeyDown)
+3:1089:0:81:1 //Base octave +2 C#: Q (KeyDown)
+3:1090:0:74:1 //Base octave +2 D: J (KeyDown)
+3:1091:0:75:1 //Base octave +2 D#: K (KeyDown)
+3:1092:0:88:1 //Base octave +2 E: X (KeyDown)
+3:1093:0:66:1 //Base octave +2 F: B (KeyDown)
+3:1094:0:77:1 //Base octave +2 F#: M (KeyDown)
+3:1095:0:87:1 //Base octave +2 G: W (KeyDown)
+3:1096:0:86:1 //Base octave +2 G#: V (KeyDown)
+3:1097:0:90:1 //Base octave +2 A: Z (KeyDown)
+3:1212:0:48:1 //Set octave 0: 0 (KeyDown)
3:1212:0:96:1 //Set octave 0: NUM 0 (KeyDown)
-3:1212:0:48:1 //Set octave 0: 0 (KeyDown)
+3:1213:0:49:1 //Set octave 1: 1 (KeyDown)
3:1213:0:97:1 //Set octave 1: NUM 1 (KeyDown)
+3:1214:0:50:1 //Set octave 2: 2 (KeyDown)
3:1214:0:98:1 //Set octave 2: NUM 2 (KeyDown)
-3:1214:0:50:1 //Set octave 2: 2 (KeyDown)
+3:1215:0:51:1 //Set octave 3: 3 (KeyDown)
3:1215:0:99:1 //Set octave 3: NUM 3 (KeyDown)
-3:1215:0:51:1 //Set octave 3: 3 (KeyDown)
3:1216:0:52:1 //Set octave 4: 4 (KeyDown)
3:1216:0:100:1 //Set octave 4: NUM 4 (KeyDown)
+3:1217:0:53:1 //Set octave 5: 5 (KeyDown)
3:1217:0:101:1 //Set octave 5: NUM 5 (KeyDown)
-3:1217:0:53:1 //Set octave 5: 5 (KeyDown)
+3:1218:0:54:1 //Set octave 6: 6 (KeyDown)
3:1218:0:102:1 //Set octave 6: NUM 6 (KeyDown)
-3:1218:0:54:1 //Set octave 6: 6 (KeyDown)
+3:1219:0:55:1 //Set octave 7: 7 (KeyDown)
3:1219:0:103:1 //Set octave 7: NUM 7 (KeyDown)
-3:1219:0:55:1 //Set octave 7: 7 (KeyDown)
3:1220:0:56:1 //Set octave 8: 8 (KeyDown)
3:1220:0:104:1 //Set octave 8: NUM 8 (KeyDown)
+3:1221:0:57:1 //Set octave 9: 9 (KeyDown)
3:1221:0:105:1 //Set octave 9: NUM 9 (KeyDown)
-3:1221:0:57:1 //Set octave 9: 9 (KeyDown)
3:1316:1:16:1 //Chord Modifier: Shift (KeyDown)
-3:1667:0:192:1 //Note cut (don't remember instrument): ` (KeyDown)
-3:1668:0:221:1 //Note off (don't remember instrument): ] (KeyDown)
+3:1200:0:192:1 //Note Cut: ` (KeyDown)
+3:1201:0:221:1 //Note Off: ] (KeyDown)
+3:1791:1:221:1 //Note Fade: Shift+] (KeyDown)
+3:1788:0:219:1 //Parameter control(MPTm only): [ (KeyDown)
+3:1789:1:219:1 //Parameter control(smooth)(MPTm only): Shift+[ (KeyDown)
//----( Pattern Context [bottom] - Ins Col (4) )------------
4:1202:0:96:1 //Set instrument digit 0: NUM 0 (KeyDown)
@@ -165,6 +190,7 @@
4:1208:0:54:1 //Set instrument digit 6: 6 (KeyDown)
4:1209:0:103:1 //Set instrument digit 7: NUM 7 (KeyDown)
4:1209:0:55:1 //Set instrument digit 7: 7 (KeyDown)
+4:1210:0:104:1 //Set instrument digit 8: NUM 8 (KeyDown)
4:1210:0:56:1 //Set instrument digit 8: 8 (KeyDown)
4:1211:0:105:1 //Set instrument digit 9: NUM 9 (KeyDown)
4:1211:0:57:1 //Set instrument digit 9: 9 (KeyDown)
@@ -187,6 +213,7 @@
5:1229:0:55:1 //Set volume digit 7: 7 (KeyDown)
5:1229:0:103:1 //Set volume digit 7: NUM 7 (KeyDown)
5:1230:0:56:1 //Set volume digit 8: 8 (KeyDown)
+5:1230:0:104:1 //Set volume digit 8: NUM 8 (KeyDown)
5:1231:0:57:1 //Set volume digit 9: 9 (KeyDown)
5:1231:0:105:1 //Set volume digit 9: NUM 9 (KeyDown)
5:1232:0:86:1 //Vol command - volume: V (KeyDown)
@@ -202,25 +229,37 @@
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:1246:0:79:1 //Vol command - Offset: O (KeyDown)
//----( Pattern Context [bottom] - FX Col (6) )------------
-6:1294:0:92:1 //FX midi macro slide: Right Windows (KeyDown)
-6:1295:0:58:1 //FX pseudo-velocity (experimental): (KeyDown)
-6:1295:1:58:1 //FX pseudo-velocity (experimental): Shift+ (KeyDown)
+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:1666:0:191:1 //FX parameter extension command: / (KeyDown)
//----( Pattern Context [bottom] - Param Col (7) )------------
7:1247:0:48:1 //FX Param digit 0: 0 (KeyDown)
+7:1247:0:96:1 //FX Param digit 0: NUM 0 (KeyDown)
7:1248:0:49:1 //FX Param digit 1: 1 (KeyDown)
+7:1248:0:97:1 //FX Param digit 1: NUM 1 (KeyDown)
7:1249:0:50:1 //FX Param digit 2: 2 (KeyDown)
+7:1249:0:98:1 //FX Param digit 2: NUM 2 (KeyDown)
7:1250:0:51:1 //FX Param digit 3: 3 (KeyDown)
+7:1250:0:99:1 //FX Param digit 3: NUM 3 (KeyDown)
7:1251:0:52:1 //FX Param digit 4: 4 (KeyDown)
+7:1251:0:100:1 //FX Param digit 4: NUM 4 (KeyDown)
7:1252:0:53:1 //FX Param digit 5: 5 (KeyDown)
+7:1252:0:101:1 //FX Param digit 5: NUM 5 (KeyDown)
7:1253:0:54:1 //FX Param digit 6: 6 (KeyDown)
+7:1253:0:102:1 //FX Param digit 6: NUM 6 (KeyDown)
7:1254:0:55:1 //FX Param digit 7: 7 (KeyDown)
+7:1254:0:103:1 //FX Param digit 7: NUM 7 (KeyDown)
7:1255:0:56:1 //FX Param digit 8: 8 (KeyDown)
+7:1255:0:104:1 //FX Param digit 8: NUM 8 (KeyDown)
7:1256:0:57:1 //FX Param digit 9: 9 (KeyDown)
+7:1256:0:105:1 //FX Param digit 9: NUM 9 (KeyDown)
7:1257:0:65:1 //FX Param digit A: A (KeyDown)
7:1258:0:66:1 //FX Param digit B: B (KeyDown)
7:1259:0:67:1 //FX Param digit C: C (KeyDown)
@@ -231,14 +270,34 @@
//----( Sample Context [bottom] (8) )------------
8:1380:2:84:1 //Trim sample around loop points: Ctrl+T (KeyDown)
8:1383:0:8:1 //Silence sample selection: BACKSPACE (KeyDown)
-8:1384:3:78:1 //Normalise Sample: Shift+Ctrl+N (KeyDown)
-8:1385:3:65:1 //Amplify Sample: Shift+Ctrl+A (KeyDown)
-8:1381:3:82:1 //Reverse sample: Shift+Ctrl+R (KeyDown)
+8:1384:1:78:1 //Normalise Sample: Shift+N (KeyDown)
+8:1385:6:65:1 //Amplify Sample: Ctrl+Alt+A (KeyDown)
+8:1385:2:77:1 //Amplify Sample: Ctrl+M (KeyDown)
+8:1381:6:82:1 //Reverse sample: Ctrl+Alt+R (KeyDown)
8:1382:0:46:1 //Delete sample selection: DELETE (KeyDown)
8:1386:0:107:1 //Zoom Out: NUM PLUS (KeyDown)
8:1387:0:109:1 //Zoom In: NUM SUB (KeyDown)
+8:1784:2:73:1 //Invert sample phase: Ctrl+I (KeyDown)
+8:1785:2:85:1 //Signed/Unsigned conversion: Ctrl+U (KeyDown)
+8:1790:2:68:1 //Remove DC Offset: Ctrl+D (KeyDown)
//----( Instrument Context [bottom] (9) )------------
+9:1825:1:9:5 //Select previous envelope point: Shift+TAB (KeyDown|KeyHold)
+9:1826:0:9:5 //Select next envelope point: TAB (KeyDown|KeyHold)
+9:1821:0:37:5 //Move envelope point left: LEFT (KeyDown|KeyHold)
+9:1822:0:39:5 //Move envelope point right: RIGHT (KeyDown|KeyHold)
+9:1823:0:38:5 //Move envelope point up: UP (KeyDown|KeyHold)
+9:1834:0:33:5 //Move envelope point up (big step): PGUP (KeyDown|KeyHold)
+9:1824:0:40:5 //Move envelope point down: DOWN (KeyDown|KeyHold)
+9:1835:0:34:5 //Move envelope point down (big step): PGDOWN (KeyDown|KeyHold)
+9:1827:0:45:1 //Insert envelope point: INSERT (KeyDown)
+9:1828:0:46:1 //Remove envelope point: DELETE (KeyDown)
+9:1828:0:8:1 //Remove envelope point: BACKSPACE (KeyDown)
+9:1829:0:36:1 //Set loop start: HOME (KeyDown)
+9:1830:0:35:1 //Set loop end: END (KeyDown)
+9:1831:2:36:1 //Set sustain loop start: Ctrl+HOME (KeyDown)
+9:1832:2:35:1 //Set sustain loop end: Ctrl+END (KeyDown)
+9:1833:2:82:1 //Toggle release node: Ctrl+R (KeyDown)
//----( Comments Context [bottom] (10) )------------
@@ -247,6 +306,11 @@
//----( Unknown Context (12) )------------
//----( Plugin GUI Context (13) )------------
+13:1763:0:37:5 //Previous plugin preset: LEFT (KeyDown|KeyHold)
+13:1764:0:39:5 //Next plugin preset: RIGHT (KeyDown|KeyHold)
+13:1782:0:38:5 //Plugin preset backward jump: UP (KeyDown|KeyHold)
+13:1783:0:40:5 //Plugin preset forward jump: DOWN (KeyDown|KeyHold)
+13:1765:2:82:1 //Randomize plugin parameters: Ctrl+R (KeyDown)
//----( General Context [top] (14) )------------
@@ -290,6 +354,6 @@
19:1816:0:57:5 //Pattern index digit 9: 9 (KeyDown|KeyHold)
19:1816:0:105:5 //Pattern index digit 9: NUM 9 (KeyDown|KeyHold)
19:1817:0:107:5 //Increase pattern index : NUM PLUS (KeyDown|KeyHold)
-19:1817:0:187:5 //Increase pattern index : + (KeyDown|KeyHold)
-19:1818:0:109:1 //Decrease pattern index: NUM SUB (KeyDown)
-19:1818:0:189:1 //Decrease pattern index: - (KeyDown)
+19:1817:0:187:5 //Increase pattern index : = (KeyDown|KeyHold)
+19:1818:0:109:5 //Decrease pattern index: NUM SUB (KeyDown|KeyHold)
+19:1818:0:189:5 //Decrease pattern index: - (KeyDown|KeyHold)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-16 23:55:35
|
Revision: 470
http://modplug.svn.sourceforge.net/modplug/?rev=470&view=rev
Author: saga-games
Date: 2010-01-16 23:55:23 +0000 (Sat, 16 Jan 2010)
Log Message:
-----------
[Mod] Changed readme file that's being used by the installer a bit (clarification of installation instructions and restricted file length to 80 characters)
Modified Paths:
--------------
trunk/OpenMPT/installer/packageTemplate/readme.txt
Modified: trunk/OpenMPT/installer/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/installer/packageTemplate/readme.txt 2010-01-16 19:48:28 UTC (rev 469)
+++ trunk/OpenMPT/installer/packageTemplate/readme.txt 2010-01-16 23:55:23 UTC (rev 470)
@@ -6,21 +6,25 @@
Migrating from OpenMPT 1.17
---------------------------
--If you have an existing installation of OpenMPT 1.17 and wish to
- re-use its settings, copy your mptrack.ini and plugin.cache
- to the directory into which you installed OpenMPT.
+If you have an existing installation of OpenMPT 1.17 and wish to re-use its
+settings, copy your mptrack.ini and plugin.cache to %appdata%\OpenMPT (or the
+directory into which you installed OpenMPT if you used portable mode).
Uninstallation
--------------
--An uninstaller is provided. It will also uninstall custom settings and tunings, so if you want to keep those, back them up first. Use "open_settings_folder.bat" to find them.
+An uninstaller is provided. It will also uninstall custom settings and tunings,
+so if you want to keep those, back them up first. Use "open_settings_folder.bat"
+to find them.
Making OpenMPT portable
-----------------------
-By default, OpenMPT stores its settings in %appdata%\OpenMPT. To avoid this, create a file called "mptrack.ini" in the same directory as mptrack.exe (if it does not exist yet) and add the following lines to this file:
+By default, OpenMPT stores its settings in %appdata%\OpenMPT. To avoid this,
+create a file called "mptrack.ini" in the same directory as mptrack.exe (if it
+does not exist yet) and add the following lines to this file:
[Paths]
UseAppDataDirectory=0
@@ -39,12 +43,15 @@
Release package contents:
-------------------------
-extraKeymaps(folder): Additional key bindings for the keyboard manager, available in several flavours (including MPT classic, FastTracker and Impulse Tracker) and country-specific layouts.
+extraKeymaps(folder): Additional key bindings for the keyboard manager,
+ available in several flavours (including MPT classic, FastTracker and
+ Impulse Tracker) and country-specific layouts.
soundtouch(folder): SoundTouch readme and copying.txt
history.txt: Version history.
mptrack.exe: Main executable.
open_settings_folder.bat: Opens settings folder.
-OpenMPT_SoundTouch_i16.dll: Slightly customized SoundTouch library used in time stretching feature.
+OpenMPT_SoundTouch_i16.dll: Slightly customized SoundTouch library used in time
+ stretching feature.
readme.txt:
unmo3.dll: Used in MO3-file import.
@@ -92,4 +99,9 @@
The MO3 software is free for non-commercial use; if anyone tries to
charge you for it, kick 'em where it hurts!
-TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD LIABLE FOR ANY DAMAGE THAT MAY RESULT FROM THE USE OF THIS SOFTWARE. YOU USE THIS SOFTWARE ENTIRELY AT YOUR OWN RISK.
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED "AS
+IS", WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT
+NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A
+PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD LIABLE FOR ANY DAMAGE THAT MAY
+RESULT FROM THE USE OF THIS SOFTWARE. YOU USE THIS SOFTWARE ENTIRELY AT YOUR OWN
+RISK.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-16 19:49:00
|
Revision: 469
http://modplug.svn.sourceforge.net/modplug/?rev=469&view=rev
Author: saga-games
Date: 2010-01-16 19:48:28 +0000 (Sat, 16 Jan 2010)
Log Message:
-----------
[New] Added InnoSetup script and resources for OpenMPT installer.
Added Paths:
-----------
trunk/OpenMPT/installer/
trunk/OpenMPT/installer/filetypes.iss
trunk/OpenMPT/installer/install-big.bmp
trunk/OpenMPT/installer/install-small.bmp
trunk/OpenMPT/installer/install.iss
trunk/OpenMPT/installer/mpt.ico
trunk/OpenMPT/installer/packageTemplate/
trunk/OpenMPT/installer/packageTemplate/readme.txt
Added: trunk/OpenMPT/installer/filetypes.iss
===================================================================
--- trunk/OpenMPT/installer/filetypes.iss (rev 0)
+++ trunk/OpenMPT/installer/filetypes.iss 2010-01-16 19:48:28 UTC (rev 469)
@@ -0,0 +1,96 @@
+; OpenMPT Install script - File associations
+; Written by Johannes Schultz
+; http://sagamusix.de/
+; http://sagagames.de/
+
+[Setup]
+ChangesAssociations=yes
+
+[Tasks]
+; common file extensions
+Name: "associate_common"; Description: "Associate OpenMPT with common module files"; GroupDescription: "File associations:";
+Name: "associate_common\mod"; Description: "ProTracker / Noise Tracker / etc. (MOD)";
+Name: "associate_common\s3m"; Description: "Scream Tracker 3 (S3M)";
+Name: "associate_common\xm"; Description: "Fasttracker 2 (XM)";
+Name: "associate_common\it"; Description: "Impulse Tracker (IT)";
+Name: "associate_common\itp"; Description: "Impulse Tracker Project (ITP)";
+Name: "associate_common\mptm"; Description: "OpenMPT (MPTM)";
+; same, but compressed
+Name: "associate_common\compressed"; Description: "Above when compressed (MDR, MDZ, S3Z, XMZ, ITZ, MPTMZ)";
+; less common
+Name: "associate_exotic"; Description: "Associate OpenMPT with less common module files"; GroupDescription: "File associations:";
+Name: "associate_exotic\669"; Description: "Composer 669 (669)";
+Name: "associate_exotic\amf"; Description: "ASYLUM Music Format / Advanced Music Format (AMF)";
+Name: "associate_exotic\ams"; Description: "Extreme Tracker (AMS)";
+Name: "associate_exotic\dbm"; Description: "DigiBooster (DBM)";
+Name: "associate_exotic\dmf"; Description: "X-Tracker (DMF)";
+Name: "associate_exotic\dsm"; Description: "DSIK (DSM)";
+Name: "associate_exotic\far"; Description: "Farandole Composer (FAR)";
+Name: "associate_exotic\gdm"; Description: "General Digital Music (GDM)";
+Name: "associate_exotic\imf"; Description: "Imago Orpheus (IMF)";
+Name: "associate_exotic\j2b"; Description: "Jazz Jackrabbit 2 Music (J2B)";
+Name: "associate_exotic\mdl"; Description: "DigiTracker (MDL)";
+Name: "associate_exotic\med"; Description: "OctaMED (MED)";
+Name: "associate_exotic\mo3"; Description: "MO3 compressed modules (MO3)";
+Name: "associate_exotic\mt2"; Description: "MadTracker 2 (MT2)";
+Name: "associate_exotic\mtm"; Description: "MultiTracker Modules (MTM)";
+Name: "associate_exotic\okt"; Description: "Oktalyzer (OKT)";
+Name: "associate_exotic\psm"; Description: "Epic Megagames MASI (PSM)";
+Name: "associate_exotic\ptm"; Description: "PolyTracker (PTM)";
+Name: "associate_exotic\stm"; Description: "Scream Tracker 2 (STM)";
+Name: "associate_exotic\ult"; Description: "UltraTracker (ULT)";
+Name: "associate_exotic\umx"; Description: "Unreal Music (UMX)";
+Name: "associate_exotic\wow"; Description: "Grave Composer (WOW)";
+
+[Registry]
+; common file extensions
+Root: HKCR; Subkey: ".mod"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\mod
+Root: HKCR; Subkey: ".s3m"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\s3m
+Root: HKCR; Subkey: ".xm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\xm
+Root: HKCR; Subkey: ".it"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\it
+Root: HKCR; Subkey: ".itp"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\itp
+Root: HKCR; Subkey: ".mptm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\mptm
+; same, but compressed
+Root: HKCR; Subkey: ".mdr"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\compressed
+Root: HKCR; Subkey: ".mdz"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\compressed
+Root: HKCR; Subkey: ".s3z"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\compressed
+Root: HKCR; Subkey: ".xmz"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\compressed
+Root: HKCR; Subkey: ".itz"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\compressed
+Root: HKCR; Subkey: ".mptmz"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_common\compressed
+; less common
+Root: HKCR; Subkey: ".669"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\669
+Root: HKCR; Subkey: ".amf"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\amf
+Root: HKCR; Subkey: ".ams"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\ams
+Root: HKCR; Subkey: ".dbm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\dbm
+Root: HKCR; Subkey: ".dmf"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\dmf
+Root: HKCR; Subkey: ".dsm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\dsm
+Root: HKCR; Subkey: ".far"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\far
+Root: HKCR; Subkey: ".gdm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\gdm
+Root: HKCR; Subkey: ".imf"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\imf
+Root: HKCR; Subkey: ".j2b"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\j2b
+Root: HKCR; Subkey: ".mdl"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\mdl
+Root: HKCR; Subkey: ".med"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\med
+Root: HKCR; Subkey: ".mo3"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\mo3
+Root: HKCR; Subkey: ".mt2"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\mt2
+Root: HKCR; Subkey: ".mtm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\mtm
+Root: HKCR; Subkey: ".okt"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\okt
+Root: HKCR; Subkey: ".psm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\psm
+Root: HKCR; Subkey: ".ptm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\ptm
+Root: HKCR; Subkey: ".stm"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\stm
+Root: HKCR; Subkey: ".ult"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\ult
+Root: HKCR; Subkey: ".umx"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\umx
+Root: HKCR; Subkey: ".wow"; ValueType: string; ValueName: ""; ValueData: "OpenMPTFile"; Flags: uninsdeletevalue; Tasks: associate_exotic\wow
+
+; important (setup)
+Root: HKCR; Subkey: "OpenMPTFile"; ValueType: string; ValueName: ""; ValueData: "OpenMPT Module"; Flags: uninsdeletekey; Tasks: associate_common or associate_exotic
+Root: HKCR; Subkey: "OpenMPTFile\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\mpt.ico,0"; Tasks: associate_common or associate_exotic
+Root: HKCR; Subkey: "OpenMPTFile\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\mptrack.exe"" ""%1"""; Tasks: associate_common or associate_exotic
+
+[Files]
+; icon file (should be moved into EXE)
+Source: "mpt.ico"; DestDir: "{app}"; Flags: ignoreversion
+
+
+
+
+
Added: trunk/OpenMPT/installer/install-big.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/OpenMPT/installer/install-big.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/OpenMPT/installer/install-small.bmp
===================================================================
(Binary files differ)
Property changes on: trunk/OpenMPT/installer/install-small.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss (rev 0)
+++ trunk/OpenMPT/installer/install.iss 2010-01-16 19:48:28 UTC (rev 469)
@@ -0,0 +1,105 @@
+; OpenMPT Install script
+; Written by Johannes Schultz
+; http://sagamusix.de/
+; http://sagagames.de/
+
+[Setup]
+AppId=OpenMPT
+AppVerName=OpenMPT 1.18
+AppVersion=1.18.00.00
+AppName=OpenMPT
+AppPublisher=OpenMPT Devs / Olivier Lapicque
+AppPublisherURL=http://www.openmpt.com/
+AppSupportURL=http://www.openmpt.com/
+AppUpdatesURL=http://www.openmpt.com/
+DefaultDirName={pf}\OpenMPT
+DefaultGroupName=OpenMPT
+AllowNoIcons=yes
+OutputDir=.\
+OutputBaseFilename=OpenMPT Setup
+Compression=lzma
+SolidCompression=yes
+WizardImageFile=install-big.bmp
+WizardSmallImageFile=install-small.bmp
+;LicenseFile=license.txt
+;CreateUninstallRegKey=no
+
+[Tasks]
+; icons and install mode
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "portable"; Description: "Use program directory to store configuration in (portable mode)"; GroupDescription: "Options:"; Flags: unchecked
+; file associations - put this below all other [tasks]!
+#include "filetypes.iss"
+
+[Languages]
+Name: "en"; MessagesFile: "compiler:Default.isl"
+
+[Files]
+; you may want to change the base paths here
+
+; preserve file type order for best solid compression results (first binary, then text)
+; home folder
+Source: "..\mptrack\bin\mptrack.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\mptrack\bin\OpenMPT_SoundTouch_i16.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\mptrack\bin\unmo3.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "packageTemplate\readme.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "..\packageTemplate\history.txt"; DestDir: "{app}"; Flags: ignoreversion
+; soundtouch license stuff
+Source: "..\packageTemplate\SoundTouch\*.*"; DestDir: "{app}\SoundTouch"; Flags: ignoreversion
+; keymaps
+Source: "..\packageTemplate\extraKeymaps\*.*"; DestDir: "{app}\extraKeymaps"; Flags: ignoreversion
+
+[Dirs]
+; option dirs for non-portable mode
+Name: "{userappdata}\OpenMPT"; Tasks: not portable
+Name: "{userappdata}\OpenMPT\tunings"; Tasks: not portable
+; dirst for portable mode
+Name: "{app}\tunings"; Tasks: portable
+
+[Icons]
+; start menu
+Name: "{group}\{cm:LaunchProgram,OpenMPT}"; Filename: "{app}\mptrack.exe"
+Name: "{group}\{cm:UninstallProgram,OpenMPT}"; Filename: "{uninstallexe}"
+Name: "{group}\ModPlug Central"; Filename: "{app}\ModPlug Central.url"
+Name: "{group}\Configuration files"; Filename: "{userappdata}\OpenMPT\"; Tasks: not portable
+
+; app's directory (for ease of use)
+Name: "{app}\Configuration files"; Filename: "{userappdata}\OpenMPT\"; Tasks: not portable
+
+; desktop, quick launch
+Name: "{userdesktop}\OpenMPT"; Filename: "{app}\mptrack.exe"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\OpenMPT"; Filename: "{app}\mptrack.exe"; Tasks: quicklaunchicon
+
+[INI]
+; enable portable mode
+Filename: "{app}\mptrack.ini"; Section: "Paths"; Key: "UseAppDataDirectory"; String: "0"; Flags: uninsdeleteentry createkeyifdoesntexist; Tasks: portable
+; internet shortcut
+Filename: "{app}\ModPlug Central.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.lpchip.com/modplug/"; Flags: createkeyifdoesntexist;
+
+[Run]
+; duh
+Filename: "{app}\mptrack.exe"; Description: "{cm:LaunchProgram,OpenMPT}"; Flags: nowait postinstall skipifsilent
+
+[UninstallDelete]
+; internet shortcut has to be deleted manually
+Type: files; Name: "{app}\ModPlug Central.url";
+; normal installation
+Type: files; Name: "{userappdata}\OpenMPT\mptrack.ini"; Tasks: not portable
+Type: files; Name: "{userappdata}\OpenMPT\plugin.cache"; Tasks: not portable
+Type: files; Name: "{userappdata}\OpenMPT\tunings\local_tunings.tc"; Tasks: not portable
+Type: dirifempty; Name: "{userappdata}\OpenMPT\tunings"; Tasks: not portable
+Type: dirifempty; Name: "{userappdata}\OpenMPT"; Tasks: not portable
+; portable installation
+Type: files; Name: "{app}\mptrack.ini"; Tasks: portable
+Type: files; Name: "{app}\plugin.cache"; Tasks: portable
+Type: files; Name: "{app}\tunings\local_tunings.tc"; Tasks: portable
+Type: dirifempty; Name: "{app}\tunings"; Tasks: portable
+
+
+
+
+
+
+
+
Added: trunk/OpenMPT/installer/mpt.ico
===================================================================
(Binary files differ)
Property changes on: trunk/OpenMPT/installer/mpt.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/OpenMPT/installer/packageTemplate/readme.txt
===================================================================
--- trunk/OpenMPT/installer/packageTemplate/readme.txt (rev 0)
+++ trunk/OpenMPT/installer/packageTemplate/readme.txt 2010-01-16 19:48:28 UTC (rev 469)
@@ -0,0 +1,95 @@
+******************
+* OpenMPT 1.18 *
+******************
+
+
+Migrating from OpenMPT 1.17
+---------------------------
+
+-If you have an existing installation of OpenMPT 1.17 and wish to
+ re-use its settings, copy your mptrack.ini and plugin.cache
+ to the directory into which you installed OpenMPT.
+
+
+Uninstallation
+--------------
+
+-An uninstaller is provided. It will also uninstall custom settings and tunings, so if you want to keep those, back them up first. Use "open_settings_folder.bat" to find them.
+
+
+Making OpenMPT portable
+-----------------------
+
+By default, OpenMPT stores its settings in %appdata%\OpenMPT. To avoid this, create a file called "mptrack.ini" in the same directory as mptrack.exe (if it does not exist yet) and add the following lines to this file:
+[Paths]
+UseAppDataDirectory=0
+
+
+Changes
+-------
+
+See history.txt.
+
+
+Questions, comments, bug reports...
+-----------------------------------
+
+See forums at http://modplug.sourceforge.net/.
+
+
+Release package contents:
+-------------------------
+extraKeymaps(folder): Additional key bindings for the keyboard manager, available in several flavours (including MPT classic, FastTracker and Impulse Tracker) and country-specific layouts.
+soundtouch(folder): SoundTouch readme and copying.txt
+history.txt: Version history.
+mptrack.exe: Main executable.
+open_settings_folder.bat: Opens settings folder.
+OpenMPT_SoundTouch_i16.dll: Slightly customized SoundTouch library used in time stretching feature.
+readme.txt:
+unmo3.dll: Used in MO3-file import.
+
+Misc:
+-----
+
+OpenMPT is partially under the following license:
+
+> Copyright (c) 2004-2010, OpenMPT contributors
+> Copyright (c) 1997-2003, Olivier Lapicque
+> All rights reserved.
+>
+> Redistribution and use in source and binary forms, with or without
+> modification, are permitted provided that the following conditions are met:
+> * Redistributions of source code must retain the above copyright
+> notice, this list of conditions and the following disclaimer.
+> * Redistributions in binary form must reproduce the above copyright
+> notice, this list of conditions and the following disclaimer in the
+> documentation and/or other materials provided with the distribution.
+> * Neither the name of the OpenMPT project nor the
+> names of its contributors may be used to endorse or promote products
+> derived from this software without specific prior written permission.
+>
+> THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY
+> EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+> WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+> DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+> DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+> (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+> LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+> ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+> (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+ASIO is a trademark and software of Steinberg Media Technologies GmbH
+VST is a trademark of Steinberg Media Technologies GmbH
+
+For more information about SoundTouch, see folder SoundTouch.
+
+unmo3.dll
+---------
+Copyright (c) 2001-2009 Ian Luck. All rights reserved
+
+The MO3 software is free for non-commercial use; if anyone tries to
+charge you for it, kick 'em where it hurts!
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD LIABLE FOR ANY DAMAGE THAT MAY RESULT FROM THE USE OF THIS SOFTWARE. YOU USE THIS SOFTWARE ENTIRELY AT YOUR OWN RISK.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-16 14:48:49
|
Revision: 468
http://modplug.svn.sourceforge.net/modplug/?rev=468&view=rev
Author: saga-games
Date: 2010-01-16 14:48:39 +0000 (Sat, 16 Jan 2010)
Log Message:
-----------
[Imp] Default max. polyphony value is 256 (maximum) now.
Modified Paths:
--------------
trunk/OpenMPT/soundlib/Sndmix.cpp
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2010-01-16 11:44:43 UTC (rev 467)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2010-01-16 14:48:39 UTC (rev 468)
@@ -33,7 +33,7 @@
// SNDMIX: These are global flags for playback control
UINT CSoundFile::m_nStereoSeparation = 128;
LONG CSoundFile::m_nStreamVolume = 0x8000;
-UINT CSoundFile::m_nMaxMixChannels = 32;
+UINT CSoundFile::m_nMaxMixChannels = MAX_CHANNELS;
// Mixing Configuration (SetWaveConfig)
DWORD CSoundFile::gdwSysInfo = 0;
DWORD CSoundFile::gnChannels = 1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rel...@us...> - 2010-01-16 11:44:53
|
Revision: 467
http://modplug.svn.sourceforge.net/modplug/?rev=467&view=rev
Author: relabsoluness
Date: 2010-01-16 11:44:43 +0000 (Sat, 16 Jan 2010)
Log Message:
-----------
[Fix] Internal: Tentative fix to compile error in VC08 with SoundTouch resources.
[Mod] Key bindings: Change to default key bindings.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
trunk/OpenMPT/soundtouch/soundtouch.vcproj
trunk/OpenMPT/soundtouch/soundtouch_08.vcproj
Added Paths:
-----------
trunk/OpenMPT/soundtouch/resource.h
Modified: trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
===================================================================
--- trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-01-15 21:15:34 UTC (rev 466)
+++ trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-01-16 11:44:43 UTC (rev 467)
@@ -168,8 +168,8 @@
3:1316:1:16:1 //Chord Modifier: Shift (KeyDown)
3:1200:0:192:1 //Note cut: ' (KeyDown)
3:1201:0:187:1 //Note off: = (KeyDown)
-3:1788:1:226:1 //Parameter control(MPTm only): Shift+< (KeyDown)
-3:1789:0:226:1 //Parameter control(smooth)(MPTm only): < (KeyDown)
+3:1788:1:189:1 //Parameter control(MPTm only): Shift+- (KeyDown)
+3:1789:0:189:1 //Parameter control(smooth)(MPTm only): - (KeyDown)
//----( Pattern Context [bottom] - Ins Col (4) )------------
4:1202:0:96:1 //Set instrument digit 0: NUM 0 (KeyDown)
Added: trunk/OpenMPT/soundtouch/resource.h
===================================================================
--- trunk/OpenMPT/soundtouch/resource.h (rev 0)
+++ trunk/OpenMPT/soundtouch/resource.h 2010-01-16 11:44:43 UTC (rev 467)
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by SoundTouchDLL.rc
+//
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE 101
+#define _APS_NEXT_COMMAND_VALUE 40001
+#define _APS_NEXT_CONTROL_VALUE 1001
+#define _APS_NEXT_SYMED_VALUE 101
+#endif
+#endif
Modified: trunk/OpenMPT/soundtouch/soundtouch.vcproj
===================================================================
--- trunk/OpenMPT/soundtouch/soundtouch.vcproj 2010-01-15 21:15:34 UTC (rev 466)
+++ trunk/OpenMPT/soundtouch/soundtouch.vcproj 2010-01-16 11:44:43 UTC (rev 467)
@@ -191,6 +191,9 @@
RelativePath=".\RateTransposer.h">
</File>
<File
+ RelativePath=".\resource.h">
+ </File>
+ <File
RelativePath=".\SoundTouch.h">
</File>
<File
Modified: trunk/OpenMPT/soundtouch/soundtouch_08.vcproj
===================================================================
--- trunk/OpenMPT/soundtouch/soundtouch_08.vcproj 2010-01-15 21:15:34 UTC (rev 466)
+++ trunk/OpenMPT/soundtouch/soundtouch_08.vcproj 2010-01-16 11:44:43 UTC (rev 467)
@@ -277,6 +277,10 @@
>
</File>
<File
+ RelativePath=".\resource.h"
+ >
+ </File>
+ <File
RelativePath=".\SoundTouch.h"
>
</File>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-15 21:16:04
|
Revision: 466
http://modplug.svn.sourceforge.net/modplug/?rev=466&view=rev
Author: saga-games
Date: 2010-01-15 21:15:34 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
[Imp] Treeview: Right-click options for mod items: "View" and "Close"
[Imp] Sample editor: When using timestretch, loop points could exceed sample length in some cases.
[Mod] Updated keymap NO_mpt_classic_(rakib).mkb
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/View_tre.h
trunk/OpenMPT/mptrack/resource.h
trunk/OpenMPT/packageTemplate/extraKeymaps/NO_mpt_classic_(rakib).mkb
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-01-14 20:46:32 UTC (rev 465)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-01-15 21:15:34 UTC (rev 466)
@@ -1711,19 +1711,17 @@
// Time stretching
if(IsDlgButtonChecked(IDC_CHECK3)){
- //rewbs.timeStretchMods
UpdateData(TRUE); //Ensure m_dTimeStretchRatio is up-to-date with textbox content
errorcode = TimeStretch(m_dTimeStretchRatio/100.0);
//Update loop points only if no error occured.
if(errorcode == 0)
{
- pSmp->nLoopStart *= m_dTimeStretchRatio/100.0;
- pSmp->nLoopEnd *= m_dTimeStretchRatio/100.0;
- pSmp->nSustainStart *= m_dTimeStretchRatio/100.0;
- pSmp->nSustainEnd *= m_dTimeStretchRatio/100.0;
+ pSmp->nLoopStart = min(pSmp->nLoopStart * (m_dTimeStretchRatio / 100.0), pSmp->nLength);
+ pSmp->nLoopEnd = min(pSmp->nLoopEnd * (m_dTimeStretchRatio/100.0), pSmp->nLength);
+ pSmp->nSustainStart = min(pSmp->nSustainStart * (m_dTimeStretchRatio/100.0), pSmp->nLength);
+ pSmp->nSustainEnd = min(pSmp->nSustainEnd * (m_dTimeStretchRatio/100.0), pSmp->nLength);
}
- //end rewbs.timeStretchMods
}
// Pitch shifting
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2010-01-14 20:46:32 UTC (rev 465)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2010-01-15 21:15:34 UTC (rev 466)
@@ -76,6 +76,7 @@
ON_COMMAND(ID_MODTREE_DUPLICATE, OnDuplicateTreeItem)
ON_COMMAND(ID_MODTREE_INSERT, OnInsertTreeItem)
ON_COMMAND(ID_MODTREE_SWITCHTO, OnSwitchToTreeItem)
+ ON_COMMAND(ID_MODTREE_CLOSE, OnCloseItem)
// -> CODE#0023
// -> DESC="IT project files (.itp)"
@@ -2295,6 +2296,12 @@
SelectItem(hItem);
switch(modItemType)
{
+ case MODITEM_HDR_SONG:
+ nDefault = ID_MODTREE_EXECUTE;
+ AppendMenu(hMenu, MF_STRING, nDefault, "&View");
+ AppendMenu(hMenu, MF_STRING, ID_MODTREE_CLOSE, "&Close");
+ break;
+
case MODITEM_COMMENTS:
nDefault = ID_MODTREE_EXECUTE;
AppendMenu(hMenu, MF_STRING, nDefault, "&View Comments");
@@ -3205,3 +3212,13 @@
GetItem(&tvi);
return (tvi.state & TVIS_EXPANDED) != 0 ? true : false;
}
+
+
+void CModTree::OnCloseItem()
+//--------------------------
+{
+ HTREEITEM hItem = GetSelectedItem();
+ CModDoc *pModDoc = GetDocumentFromItem(hItem);
+ if(pModDoc == nullptr) return;
+ pModDoc->OnCloseDocument();
+}
Modified: trunk/OpenMPT/mptrack/View_tre.h
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.h 2010-01-14 20:46:32 UTC (rev 465)
+++ trunk/OpenMPT/mptrack/View_tre.h 2010-01-15 21:15:34 UTC (rev 466)
@@ -209,6 +209,7 @@
afx_msg void OnDuplicateTreeItem();
afx_msg void OnInsertTreeItem();
afx_msg void OnSwitchToTreeItem(); // hack for sequence items to avoid double-click action
+ afx_msg void OnCloseItem();
// -> CODE#0023
// -> DESC="IT project files (.itp)"
Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h 2010-01-14 20:46:32 UTC (rev 465)
+++ trunk/OpenMPT/mptrack/resource.h 2010-01-15 21:15:34 UTC (rev 466)
@@ -1177,15 +1177,17 @@
#define ID_EDIT_PUSHFORWARDPASTE 59239
#define ID_EDIT_SPLITKEYBOARDSETTINGS 59240
#define ID_EDIT_PASTESPECIAL 59241
+#define ID_CHANGE_PCNOTE_PARAM 59242
+#define ID_MODTREE_CLOSE 60243
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 524
-#define _APS_NEXT_COMMAND_VALUE 59242
-#define _APS_NEXT_CONTROL_VALUE 2413
+#define _APS_NEXT_RESOURCE_VALUE 526
+#define _APS_NEXT_COMMAND_VALUE 60244
+#define _APS_NEXT_CONTROL_VALUE 2426
#define _APS_NEXT_SYMED_VALUE 901
#endif
#endif
Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/NO_mpt_classic_(rakib).mkb
===================================================================
--- trunk/OpenMPT/packageTemplate/extraKeymaps/NO_mpt_classic_(rakib).mkb 2010-01-14 20:46:32 UTC (rev 465)
+++ trunk/OpenMPT/packageTemplate/extraKeymaps/NO_mpt_classic_(rakib).mkb 2010-01-15 21:15:34 UTC (rev 466)
@@ -22,6 +22,7 @@
0:1359:2:90:1 //Undo: Ctrl+Z (KeyDown)
0:1360:2:88:1 //Cut: Ctrl+X (KeyDown)
0:1361:2:67:1 //Copy: Ctrl+C (KeyDown)
+0:1361:2:45:1 //Copy: Ctrl+INS (KeyDown)
0:1362:2:86:1 //Paste: Ctrl+V (KeyDown)
0:1362:1:45:1 //Paste: Shift+INS (KeyDown)
0:1364:2:53:1 //SelectAll: Ctrl+5 (KeyDown)
@@ -68,8 +69,7 @@
2:1048:2:35:1 //Go to last row: Ctrl+END (KeyDown)
2:1049:6:35:1 //Go to last row of last channel: Ctrl+Alt+END (KeyDown)
2:1050:1:16:1 //Selection key: Shift+SKIFT (KeyDown)
-2:1051:2:17:1 //Copy select key: Ctrl (KeyDown)
-2:1011:2:65:1 //Select channel / Select all: Ctrl+A (KeyDown)
+2:1011:2:76:1 //Select channel / Select all: Ctrl+L (KeyDown)
2:1663:0:122:1 //Toggle follow song: F11 (KeyDown)
2:1003:0:13:5 //Quick copy: ENTER (KeyDown|KeyHold)
2:1004:0:32:5 //Quick paste: MELLOMROM (KeyDown|KeyHold)
@@ -83,6 +83,7 @@
2:1005:0:121:5 //Mute current channel: F10 (KeyDown|KeyHold)
2:1006:2:121:5 //Solo current channel: Ctrl+F10 (KeyDown|KeyHold)
2:1007:2:81:5 //Transpose +1: Ctrl+Q (KeyDown|KeyHold)
+2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold)
2:1009:3:81:5 //Transpose +12: Shift+Ctrl+Q (KeyDown|KeyHold)
2:1010:3:65:5 //Transpose -12: Shift+Ctrl+A (KeyDown|KeyHold)
2:1012:2:77:1 //Amplify selection: Ctrl+M (KeyDown)
@@ -114,6 +115,7 @@
3:1070:0:85:1 //Base octave F#: U (KeyDown)
3:1071:0:73:1 //Base octave G: I (KeyDown)
3:1072:0:79:1 //Base octave G#: O (KeyDown)
+3:1073:0:80:1 //Base octave A: P (KeyDown)
3:1074:0:221:1 //Base octave A#: \xE5 (KeyDown)
3:1075:0:186:1 //Base octave B: T\xD8DLER (KeyDown)
3:1076:0:65:1 //Base octave +1 C: A (KeyDown)
@@ -137,8 +139,8 @@
3:1094:0:77:1 //Base octave +2 F#: M (KeyDown)
3:1095:0:188:1 //Base octave +2 G: , (KeyDown)
3:1096:0:190:1 //Base octave +2 G#: . (KeyDown)
+3:1097:0:189:1 //Base octave +2 A: - (KeyDown)
3:1212:0:48:1 //Set octave 0: 0 (KeyDown)
-3:1212:0:96:1 //Set octave 0: NUM 0 (KeyDown)
3:1213:0:49:1 //Set octave 1: 1 (KeyDown)
3:1213:0:97:1 //Set octave 1: NUM 1 (KeyDown)
3:1214:0:50:1 //Set octave 2: 2 (KeyDown)
@@ -158,9 +160,9 @@
3:1221:0:57:1 //Set octave 9: 9 (KeyDown)
3:1221:0:105:1 //Set octave 9: NUM 9 (KeyDown)
3:1316:1:16:1 //Chord Modifier: Shift+SKIFT (KeyDown)
-3:1667:0:219:1 //Note Cut (don't remember instrument): \ (KeyDown)
-3:1668:0:187:1 //Note Off (don't remember instrument): + (KeyDown)
-3:1792:0:226:1 //Note Fade (don't remember instrument): < (KeyDown)
+3:1200:0:219:1 //Note Cut: \ (KeyDown)
+3:1201:0:187:1 //Note Off: + (KeyDown)
+3:1791:1:219:1 //Note Fade: Shift+\ (KeyDown)
//----( Pattern Context [bottom] - Ins Col (4) )------------
4:1202:0:96:1 //Set instrument digit 0: NUM 0 (KeyDown)
@@ -253,9 +255,9 @@
//----( Sample Context [bottom] (8) )------------
8:1380:2:84:1 //Trim sample around loop points: Ctrl+T (KeyDown)
-8:1384:3:78:1 //Normalise Sample: Shift+Ctrl+N (KeyDown)
-8:1385:2:65:1 //Amplify Sample: Ctrl+A (KeyDown)
-8:1381:2:82:1 //Reverse sample: Ctrl+R (KeyDown)
+8:1383:0:8:1 //Silence sample selection: TILBAKE (KeyDown)
+8:1385:3:65:1 //Amplify Sample: Shift+Ctrl+A (KeyDown)
+8:1381:3:82:1 //Reverse sample: Shift+Ctrl+R (KeyDown)
8:1382:0:46:1 //Delete sample selection: DEL (KeyDown)
8:1386:0:107:1 //Zoom Out: NUM PLUSS (KeyDown)
8:1387:0:109:1 //Zoom In: NUM MINUS (KeyDown)
@@ -264,6 +266,21 @@
8:1790:2:68:1 //Remove DC Offset: Ctrl+D (KeyDown)
//----( Instrument Context [bottom] (9) )------------
+9:1825:1:9:5 //Select previous envelope point: Shift+TAB (KeyDown|KeyHold)
+9:1826:0:9:5 //Select next envelope point: TAB (KeyDown|KeyHold)
+9:1821:0:37:5 //Move envelope point left: PIL VENSTRE (KeyDown|KeyHold)
+9:1822:0:39:5 //Move envelope point right: PIL H\xD8YRE (KeyDown|KeyHold)
+9:1823:0:38:5 //Move envelope point up: PIL OPP (KeyDown|KeyHold)
+9:1834:0:33:5 //Move envelope point up (big step): PGUP (KeyDown|KeyHold)
+9:1824:0:40:5 //Move envelope point down: PIL NED (KeyDown|KeyHold)
+9:1835:0:34:5 //Move envelope point down (big step): PGDN (KeyDown|KeyHold)
+9:1827:0:45:5 //Insert envelope point: INS (KeyDown|KeyHold)
+9:1828:0:46:5 //Remove envelope point: DEL (KeyDown|KeyHold)
+9:1829:0:36:1 //Set loop start: HOME (KeyDown)
+9:1830:0:35:5 //Set loop end: END (KeyDown|KeyHold)
+9:1831:2:36:1 //Set sustain loop start: Ctrl+HOME (KeyDown)
+9:1832:2:35:1 //Set sustain loop end: Ctrl+END (KeyDown)
+9:1833:2:82:1 //Toggle release node: Ctrl+R (KeyDown)
//----( Comments Context [bottom] (10) )------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rel...@us...> - 2010-01-14 20:46:42
|
Revision: 465
http://modplug.svn.sourceforge.net/modplug/?rev=465&view=rev
Author: relabsoluness
Date: 2010-01-14 20:46:32 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
[Fix] Sample tab: Fix to possible crash if trying to use time stretching without SoundTouch DLL available.
[Fix] Internal: mptrack_08.vcproj wasn't updated in rev. 462.
[Imp] Keymaps: Updated default keybindings.
[Mod] Version: Changed version to 1.18.
[Mod] PackageTemplate: Update to history.txt.
[Mod] Misc: Removed unused DLL from version control, added version resource to SoundTouch DLL.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/Mptrack.h
trunk/OpenMPT/mptrack/mptrack.vcproj
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
trunk/OpenMPT/mptrack/version.h
trunk/OpenMPT/packageTemplate/History.txt
trunk/OpenMPT/soundtouch/soundtouch.vcproj
trunk/OpenMPT/soundtouch/soundtouch_08.vcproj
Added Paths:
-----------
trunk/OpenMPT/soundtouch/SoundTouchDLL.rc
Removed Paths:
-------------
trunk/OpenMPT/mptrack/bin/OpenMPT_SoundTouch.dll
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-01-14 20:46:32 UTC (rev 465)
@@ -16,6 +16,7 @@
#include "smbPitchShift.cpp"
#pragma warning(default:4244) //"conversion from 'type1' to 'type2', possible loss of data"
#include "modsmp_ctrl.h"
+#include <Shlwapi.h>
#ifdef _DEBUG
#define new DEBUG_NEW
@@ -1799,7 +1800,11 @@
if (handleSt == NULL)
{
- handleSt = soundtouch_createInstance();
+ // Check whether the DLL file exists.
+ CString sPath;
+ sPath.Format(TEXT("%s%s"), CTrackApp::GetAppDirPath(), TEXT("OpenMPT_SoundTouch_i16.dll"));
+ if (sPath.GetLength() <= _MAX_PATH && PathFileExists(sPath) == TRUE)
+ handleSt = soundtouch_createInstance();
}
if (handleSt == NULL)
{
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-14 20:46:32 UTC (rev 465)
@@ -252,6 +252,8 @@
}
+TCHAR CTrackApp::m_szExePath[_MAX_PATH] = TEXT("");
+
/////////////////////////////////////////////////////////////////////////////
// MPTRACK Command Line options
Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/Mptrack.h 2010-01-14 20:46:32 UTC (rev 465)
@@ -153,7 +153,7 @@
HANDLE m_hAlternateResourceHandle;
// Default macro configuration
MODMIDICFG m_MidiCfg;
- TCHAR m_szExePath[_MAX_PATH];
+ static TCHAR m_szExePath[_MAX_PATH];
TCHAR m_szConfigDirectory[_MAX_PATH];
TCHAR m_szConfigFileName[_MAX_PATH];
TCHAR m_szPluginCacheFileName[_MAX_PATH];
@@ -175,6 +175,7 @@
static VOID SetAsProject(BOOL n) { m_nProject = n; }
// -! NEW_FEATURE#0023
+ static LPCTSTR GetAppDirPath() {return m_szExePath;} // Returns '\'-ended executable directory path.
static UINT GetDefaultDocType() { return m_nDefaultDocType; }
static VOID SetDefaultDocType(UINT n) { m_nDefaultDocType = n; }
static LPMIDILIBSTRUCT GetMidiLibrary() { return glpMidiLibrary; }
Deleted: trunk/OpenMPT/mptrack/bin/OpenMPT_SoundTouch.dll
===================================================================
(Binary files differ)
Modified: trunk/OpenMPT/mptrack/mptrack.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.vcproj 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/mptrack.vcproj 2010-01-14 20:46:32 UTC (rev 465)
@@ -54,7 +54,7 @@
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch_i16.dll"
+ DelayLoadDLLs="OpenMPT_SoundTouch_i16.dll"
GenerateDebugInformation="TRUE"
AssemblyDebug="1"
ProgramDatabaseFile=".\Debug/mptrack.pdb"
@@ -132,7 +132,7 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch_i16.dll"
+ DelayLoadDLLs="OpenMPT_SoundTouch_i16.dll"
GenerateDebugInformation="TRUE"
GenerateMapFile="FALSE"
MapFileName=".\Release/mptrack.map"
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2010-01-14 20:46:32 UTC (rev 465)
@@ -89,7 +89,7 @@
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch.dll"
+ DelayLoadDLLs="OpenMPT_SoundTouch_i16.dll"
GenerateDebugInformation="true"
AssemblyDebug="1"
ProgramDatabaseFile=".\Debug/mptrack.pdb"
@@ -195,7 +195,7 @@
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch.dll"
+ DelayLoadDLLs="OpenMPT_SoundTouch_i16.dll"
GenerateDebugInformation="true"
GenerateMapFile="false"
MapFileName=".\Release/mptrack.map"
Modified: trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb
===================================================================
--- trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/res/defaultKeybindings.mkb 2010-01-14 20:46:32 UTC (rev 465)
@@ -8,6 +8,7 @@
0:1347:2:78:1 //File/New: Ctrl+N (KeyDown)
0:1346:2:79:1 //File/Open: Ctrl+O (KeyDown)
0:1349:2:83:1 //File/Save: Ctrl+S (KeyDown)
+0:1350:3:83:1 //File/Save As: Shift+Ctrl+S (KeyDown)
0:1030:0:116:1 //Play song/Pause song: F5 (KeyDown)
0:1031:0:119:1 //Pause song: F8 (KeyDown)
0:1375:0:27:1 //Stop Song: ESC (KeyDown)
@@ -21,6 +22,9 @@
0:1361:2:45:1 //Copy: Ctrl+INSERT (KeyDown)
0:1362:2:86:1 //Paste: Ctrl+V (KeyDown)
0:1362:1:45:1 //Paste: Shift+INSERT (KeyDown)
+0:1363:1:86:1 //Mix Paste: Shift+V (KeyDown)
+0:1793:3:86:1 //Paste Flood: Shift+Ctrl+V (KeyDown)
+0:1820:6:86:1 //Push Forward Paste: Ctrl+Alt+V (KeyDown)
0:1364:2:53:1 //SelectAll: Ctrl+5 (KeyDown)
0:1365:2:70:1 //Find: Ctrl+F (KeyDown)
0:1366:0:114:1 //Find Next: F3 (KeyDown)
@@ -31,6 +35,7 @@
0:1025:1:120:1 //View Comments: Shift+F9 (KeyDown)
0:1368:2:113:1 //Toggle Tree View: Ctrl+F2 (KeyDown)
0:1369:2:112:1 //View Options: Ctrl+F1 (KeyDown)
+0:1781:2:114:1 //View MIDI mapping: Ctrl+F3 (KeyDown)
0:1370:0:112:1 //Help (to do): F1 (KeyDown)
0:1032:2:111:5 //Previous instrument: Ctrl+NUM DIVIDE (KeyDown|KeyHold)
0:1032:2:38:5 //Previous instrument: Ctrl+UP (KeyDown|KeyHold)
@@ -76,8 +81,12 @@
2:1685:2:9:1 //Switch to order list: Ctrl+TAB (KeyDown)
2:1662:6:80:1 //Toggle channel's plugin editor: Ctrl+Alt+P (KeyDown)
2:1062:0:93:1 //Show note properties: Application (KeyDown)
+2:1819:2:69:1 //Split Keyboard Settings dialog: Ctrl+E (KeyDown)
+2:1776:6:32:1 //Toggle loop pattern: Ctrl+Alt+SPACE (KeyDown)
+2:1780:2:84:1 //Show playback time at current row: Ctrl+T (KeyDown)
2:1005:0:121:5 //Mute current channel: F10 (KeyDown|KeyHold)
2:1006:2:121:5 //Solo current channel: Ctrl+F10 (KeyDown|KeyHold)
+2:1786:2:82:1 //Reset channel: Ctrl+R (KeyDown)
2:1007:2:81:5 //Transpose +1: Ctrl+Q (KeyDown|KeyHold)
2:1008:2:65:5 //Transpose -1: Ctrl+A (KeyDown|KeyHold)
2:1009:3:81:5 //Transpose +12: Shift+Ctrl+Q (KeyDown|KeyHold)
@@ -159,6 +168,8 @@
3:1316:1:16:1 //Chord Modifier: Shift (KeyDown)
3:1200:0:192:1 //Note cut: ' (KeyDown)
3:1201:0:187:1 //Note off: = (KeyDown)
+3:1788:1:226:1 //Parameter control(MPTm only): Shift+< (KeyDown)
+3:1789:0:226:1 //Parameter control(smooth)(MPTm only): < (KeyDown)
//----( Pattern Context [bottom] - Ins Col (4) )------------
4:1202:0:96:1 //Set instrument digit 0: NUM 0 (KeyDown)
@@ -219,7 +230,6 @@
//----( 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)
//----( Pattern Context [bottom] - Param Col (7) )------------
7:1247:0:48:1 //FX Param digit 0: 0 (KeyDown)
@@ -252,13 +262,32 @@
//----( Sample Context [bottom] (8) )------------
8:1380:2:84:1 //Trim sample around loop points: Ctrl+T (KeyDown)
8:1383:0:8:1 //Silence sample selection: BACKSPACE (KeyDown)
+8:1384:1:78:1 //Normalise Sample: Shift+N (KeyDown)
8:1385:3:65:1 //Amplify Sample: Shift+Ctrl+A (KeyDown)
8:1381:3:82:1 //Reverse sample: Shift+Ctrl+R (KeyDown)
8:1382:0:46:1 //Delete sample selection: DELETE (KeyDown)
8:1386:0:107:1 //Zoom Out: NUM PLUS (KeyDown)
8:1387:0:109:1 //Zoom In: NUM SUB (KeyDown)
+8:1784:2:73:1 //Invert sample phase: Ctrl+I (KeyDown)
+8:1785:2:85:1 //Signed/Unsigned conversion: Ctrl+U (KeyDown)
+8:1790:2:68:1 //Remove DC Offset: Ctrl+D (KeyDown)
//----( Instrument Context [bottom] (9) )------------
+9:1825:1:9:5 //Select previous envelope point: Shift+TAB (KeyDown|KeyHold)
+9:1826:0:9:5 //Select next envelope point: TAB (KeyDown|KeyHold)
+9:1821:0:37:5 //Move envelope point left: LEFT (KeyDown|KeyHold)
+9:1822:0:39:5 //Move envelope point right: RIGHT (KeyDown|KeyHold)
+9:1823:0:38:5 //Move envelope point up: UP (KeyDown|KeyHold)
+9:1834:0:33:5 //Move envelope point up (big step): PG UP (KeyDown|KeyHold)
+9:1824:0:40:5 //Move envelope point down: DOWN (KeyDown|KeyHold)
+9:1835:0:34:5 //Move envelope point down (big step): PG DN (KeyDown|KeyHold)
+9:1827:0:45:5 //Insert envelope point: INSERT (KeyDown|KeyHold)
+9:1828:0:46:5 //Remove envelope point: DELETE (KeyDown|KeyHold)
+9:1829:0:36:1 //Set loop start: HOME (KeyDown)
+9:1830:0:35:1 //Set loop end: END (KeyDown)
+9:1831:2:36:1 //Set sustain loop start: Ctrl+HOME (KeyDown)
+9:1832:2:35:1 //Set sustain loop end: Ctrl+END (KeyDown)
+9:1833:2:82:1 //Toggle release node: Ctrl+R (KeyDown)
//----( Comments Context [bottom] (10) )------------
@@ -267,6 +296,11 @@
//----( Unknown Context (12) )------------
//----( Plugin GUI Context (13) )------------
+13:1763:2:109:5 //Previous plugin preset: Ctrl+NUM SUB (KeyDown|KeyHold)
+13:1764:2:107:5 //Next plugin preset: Ctrl+NUM PLUS (KeyDown|KeyHold)
+13:1782:0:109:5 //Plugin preset backward jump: NUM SUB (KeyDown|KeyHold)
+13:1783:0:107:5 //Plugin preset forward jump: NUM PLUS (KeyDown|KeyHold)
+13:1765:2:82:5 //Randomize plugin parameters: Ctrl+R (KeyDown|KeyHold)
//----( General Context [top] (14) )------------
Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/mptrack/version.h 2010-01-14 20:46:32 UTC (rev 465)
@@ -13,9 +13,9 @@
//Version definitions. The only thing that needs to be changed when changing version number.
#define VER_MAJORMAJOR 1
-#define VER_MAJOR 17
-#define VER_MINOR 03
-#define VER_MINORMINOR 03
+#define VER_MAJOR 18
+#define VER_MINOR 00
+#define VER_MINORMINOR 00
//Creates version number from version parts that appears in version string.
//For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of
Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/packageTemplate/History.txt 2010-01-14 20:46:32 UTC (rev 465)
@@ -76,6 +76,7 @@
/ <Jojo> Removed time stretcher's / pitch shifter's preview function as it's unnecessary now.
. <Jojo> When going down close to 0 Hz in the sample editor, the sample freq wrapped around to the maximum value.
. <Jojo> Insert Silence: Loop points were not updated when adding silence at the beginning of the sample
+ . <re> Actions such as time stretching and undo could trigger sample play.
Instrument tab
. <Jojo> When playing an instrument and disabling its envelopes at the same time, the toggled envelopes are stopped (prevents filter envelope from turning into a pitch envelope).
Added: trunk/OpenMPT/soundtouch/SoundTouchDLL.rc
===================================================================
--- trunk/OpenMPT/soundtouch/SoundTouchDLL.rc (rev 0)
+++ trunk/OpenMPT/soundtouch/SoundTouchDLL.rc 2010-01-14 20:46:32 UTC (rev 465)
@@ -0,0 +1,114 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "#include ""afxres.h""\r\n"
+ "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// Finnish resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FIN)
+#ifdef _WIN32
+LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,5,0,0
+ PRODUCTVERSION 1,5,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "000004b0"
+ BEGIN
+ VALUE "Comments", "This is a slightly customized build of SoundTouch DLL for OpenMPT using INTEGER_SAMPLES."
+ VALUE "FileDescription", "SoundTouch Dynamic Link Library"
+ VALUE "FileVersion", "1, 5, 0, 0"
+ VALUE "InternalName", "SoundTouch"
+ VALUE "LegalCopyright", "Copyright (C) Olli Parviainen 1999-2009"
+ VALUE "OriginalFilename", "OpenMPT_SoundTouch_i16.dll"
+ VALUE "ProductName", " SoundTouch Dynamic Link Library"
+ VALUE "ProductVersion", "1, 5, 0, 0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x0, 1200
+ END
+END
+
+#endif // Finnish resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Modified: trunk/OpenMPT/soundtouch/soundtouch.vcproj
===================================================================
--- trunk/OpenMPT/soundtouch/soundtouch.vcproj 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/soundtouch/soundtouch.vcproj 2010-01-14 20:46:32 UTC (rev 465)
@@ -207,6 +207,9 @@
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+ <File
+ RelativePath=".\SoundTouchDLL.rc">
+ </File>
</Filter>
</Files>
<Globals>
Modified: trunk/OpenMPT/soundtouch/soundtouch_08.vcproj
===================================================================
--- trunk/OpenMPT/soundtouch/soundtouch_08.vcproj 2010-01-10 21:54:41 UTC (rev 464)
+++ trunk/OpenMPT/soundtouch/soundtouch_08.vcproj 2010-01-14 20:46:32 UTC (rev 465)
@@ -298,6 +298,10 @@
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
+ <File
+ RelativePath=".\SoundTouchDLL.rc"
+ >
+ </File>
</Filter>
</Files>
<Globals>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-10 21:54:51
|
Revision: 464
http://modplug.svn.sourceforge.net/modplug/?rev=464&view=rev
Author: saga-games
Date: 2010-01-10 21:54:41 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
[Fix] Sample editor: Using "resize sample" created an invalid undo point which could lead to broken samples and even crashes.
[Mod] Updated the "what's new" dialog a bit (removed leading spaces, as they look ugly in Vista/Win7 messageboxes anyway (those have a slightly different format, so every line was too long))
[Mod] Changed history... (Ok, I just changed history.txt)
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/View_smp.cpp
trunk/OpenMPT/packageTemplate/History.txt
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-10 18:21:30 UTC (rev 463)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-10 21:54:41 UTC (rev 464)
@@ -228,26 +228,25 @@
//-----------------------------
{
const char* const firstOpenMessage = "OpenMPT build " MPT_VERSION_STR ".\n\n"
- "Some changes since version 1.17.02.54:\n\n"
- " [New] Pattern tab: New paste modes: overflow, push forward and flood.\n"
- " [Mod] Pattern tab: Keyboard split is now accessible from keyshortcut or menu.\n"
- " [Imp] Pattern tab: Numerous improvements including better effect descriptions in note properties.\n"
- " [New] Sequence editor: Can now handle order selections including delete/copy/cut/paste functionality.\n"
- " [New] Sequence editor: Can render selected patterns to wave directly from orderlist.\n"
- " [New] Envelope editor: Numerous improvements including ability to insert and remove points easily.\n"
- " [New] Sample tab: sample undo, sample draw, resize sample, DC offset removal, batch export, better loop...\n"
- " ...point handling when deleting selections. Play sample from given position with Ctrl + left mouse button.\n"
- " [New] MPTM: New parameter controls for controlling plug params from pattern.\n"
- " [New] MPTM: Can have envelope points up to 240 and multiple sequences.\n"
- " [New] MIDI mapping: Editing a plug param in its editor while holding shift key will now open MIDI mapping dialog.\n"
- " [New] MIDI mapping: Can now record MIDI mapping changes to pattern.\n"
- " [Imp] MOD/S3M/XM/IT: Numerous improvements to load, save and playback compatibility.\n"
- " [New] Input: Can import RIFF AM, RIFF AMFF, J2B, PSM16, IMF, GDM and SCL files. Improved PSM import.\n"
- " [New] Setup: New default directories: plugins and plugin presets, sharable colour schemes\n"
- " [New] Cleanup: New option compo cleanup, rearrange samples is back, can merge sequences.\n"
- " [Mod] Misc: Program settings are now by default stored in %APPDATA%\\OpenMPT\n"
- "\n"
- " and many more. See history.txt for more details.";
+ "Some changes since version 1.17.02.54:\n\n"
+ "[New] Pattern tab: New paste modes: overflow, push forward and flood.\n"
+ "[Mod] Pattern tab: Keyboard split is now accessible from key shortcut or menu.\n"
+ "[Imp] Pattern tab: Numerous improvements including better effect descriptions in note properties.\n"
+ "[New] Sequence editor: Can now handle order selections including delete/copy/cut/paste functionality.\n"
+ "[New] Sequence editor: Can render selected patterns to wave directly from orderlist.\n"
+ "[New] Envelope editor: Numerous improvements including ability to insert and remove points easily and editing envelopes with the keyboard.\n"
+ "[New] Sample tab: sample undo, sample draw, resize sample, DC offset removal, batch export, better loop point handling when deleting selections. Play sample from given position with Ctrl + left mouse button.\n"
+ "[New] MPTM: New parameter controls for controlling plug params from pattern.\n"
+ "[New] MPTM: Can have envelope points up to 240 and multiple sequences.\n"
+ "[New] MIDI mapping: Editing a plug param in its editor while holding shift key will now open MIDI mapping dialog.\n"
+ "[New] MIDI mapping: Can now record MIDI mapping changes to pattern.\n"
+ "[Imp] MOD/S3M/XM/IT: Numerous improvements to load, save and playback compatibility.\n"
+ "[New] Input: Can import J2B (RIFF AM / RIFF AMFF), PSM16, IMF, GDM and SCL files. Improved PSM import.\n"
+ "[New] Setup: New default directories: plugins and plugin presets, sharable colour schemes\n"
+ "[New] Cleanup: New option compo cleanup, rearrange samples is back, can merge sequences.\n"
+ "[Mod] Misc: Program settings are now by default stored in %APPDATA%\\OpenMPT\n"
+ "\n"
+ "and many more. See history.txt for more details.";
CMainFrame::GetMainFrame()->MessageBox(firstOpenMessage, "OpenMPT " MPT_VERSION_STR, MB_ICONINFORMATION);
}
@@ -3279,7 +3278,7 @@
* - load: true: load dialog. false: save dialog.
* - defaultExtension: dialog should use this as the default extension for the file(s)
* - defaultFilename: dialog should use this as the default filename
- * - extFilter: list of possible extensions. format: "description|extensions|description|extensions|..."
+ * - extFilter: list of possible extensions. format: "description|extensions|...|description|extensions||"
* - workingDirectory: default directory of the dialog
* - allowMultiSelect: allow the user to select multiple files? (will be ignored if load == false)
* - filterIndex: pointer to a variable holding the index of the last extension filter used.
Modified: trunk/OpenMPT/mptrack/View_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp 2010-01-10 18:21:30 UTC (rev 463)
+++ trunk/OpenMPT/mptrack/View_smp.cpp 2010-01-10 21:54:41 UTC (rev 464)
@@ -2467,9 +2467,9 @@
// resize - dlg.m_nSamples = new size
if(dlg.m_nSamples != pSmp->nLength)
{
- if(dlg.m_nSamples < pSmp->nLength)
- pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_delete, dlg.m_nSamples, pSmp->nLength - dlg.m_nSamples);
- else
+ if(dlg.m_nSamples < pSmp->nLength) // make it shorter!
+ pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_delete, dlg.m_nSamples, pSmp->nLength);
+ else // make it longer!
pModDoc->GetSampleUndo()->PrepareUndo(m_nSample, sundo_insert, pSmp->nLength, dlg.m_nSamples);
ctrlSmp::ResizeSample(pSndFile->Samples[m_nSample], dlg.m_nSamples, pSndFile);
}
Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt 2010-01-10 18:21:30 UTC (rev 463)
+++ trunk/OpenMPT/packageTemplate/History.txt 2010-01-10 21:54:41 UTC (rev 464)
@@ -21,35 +21,34 @@
^ <Jojo> Duplicate / Create new pattern shortcuts do also work here now.
^ <Jojo> Show cut/copy/paste orders in context menu.
^ <Jojo> Middle click can now also be used for queuing patterns.
- . <Jojo> Show correct shortcuts in context menus
. <Jojo> Pasting orders now removes "+++" items if they are not supported by the current format.
. <Jojo> Fixed display error when selecting multiple orders, inserting them and clicking on another order (only first order of previous selection was un-highlighted).
Pattern tab::Pattern editing
+ <Jojo> New paste mode "push forward paste", which resembles the default paste behaviour of Impulse Tracker. Includes new shortcut.
+ <Jojo> The "paste flood" command pastes the clipboard content again and again until it hits the bottom of the pattern (overflow paste will be disabled automatically if paste flood is used, for obvious reasons).
- ^ <Jojo> When using the MPTM format, plugin param changes are written to the pattern as PC Notes.
+ ^ <Jojo> When using the MPTM format, plugin param changes are written to the pattern as PC Notes (instead of smooth midi macros).
^ <Jojo> Assume that the clipboard pattern format is IT (instead of MOD) if no information about the format is available.
^ <Jojo> Pattern c&p: convert pasted commands if necessary.
/ <re> Pattern c&p: Mix paste shouldn't anymore trigger conversion on modcommands that weren't changed at all. Now, however, partial conversion will not be done so this still needs further fixing.
+ . <Jojo> Pattern c&p: invalid commands are not pasted anymore.
^ <Jojo> If "record note off" is enabled and Note Off commands are not supported by the current format, try Note Cut and volume commands.
- / <Jojo> It is impossible to enter something into the volume column in mod format now.
- / <Jojo> When interpolating PC notes, the plugin number and note type won't get overriden if the note type is already PC or PCs. I find this more logical.
+ / <Jojo> It is impossible to enter something into the volume column in MOD format now.
+ / <Jojo> When interpolating PC notes, the plugin number and note type won't get overriden if the note type is already PC or PCs.
. <re> Pattern c&p: Mix paste should behave better with parameter control notes.
- . <Jojo> PCNote handling was missing in OnClearSelection, so it was possible to delete the effect column only partly
+ . <Jojo> PC note handling was missing in OnClearSelection, so it was possible to delete the "effect column" (parameter value) only partly
. <Jojo> Amplify acted VERY weird when it was applied on an instrument that's not assigned to any sample. Should be a bit better now.
- . <Jojo> Amplify doesn't use volume column in mod format anymore.
+ . <Jojo> Amplify doesn't use volume column in MOD format anymore.
. <Jojo> When recording live from the keyboard, SDx shouldn't exceed the song speed anymore.
. <Jojo> Got rid of possible redundant undo points.
- . <Jojo> Pattern c&p: invalid commands are not pasted anymore.
- . <Jojo> PC Notes are now deleted properly (last column).
+ . <Jojo> PC notes are now deleted properly (last column).
. <Jojo> Copying only the param column of PC notes overwrote the value column when pasting them.
. <Jojo> Entering Note Fade notes didn't work the "old style" way.
- . <Jojo> PCNote handling was missing in OnClearSelection, so it was possible to delete the effect column only partly.
+ . <Jojo> PC note handling was missing in OnClearSelection, so it was possible to delete the effect column only partly.
Pattern tab::GUI
+ <Jojo> Channel rename dialog in channel header context menu.
- ^ <Jojo> Tidied up the upper panel. It fits perfectly on a 1024x768 screen with treeview enabled and also works on 800x600 with treeview disabled. With the new layout, about 8 more pattern rows can be seen.
+ ^ <Jojo> Tidied up the upper panel. It fits perfectly on a 1024x768 screen with treeview enabled and also works on 800x600 with treeview disabled. With the new layout, about 8 more pattern rows can be seen in comparison to the old, bloated 1.17.02.* interface.
/ <Jojo> Due to this cleanup, the "split keyboard" feature has been removed from the interface. The split keyboard settings dialog can now be accessed by using a shortcut, which should be even faster than the old method.
^ <re> If keyboard split is active, instrument drop list will show split instrument and split note.
^ <Jojo> Grey out pattern name input field when in MOD/S3M mode.
@@ -77,7 +76,6 @@
/ <Jojo> Removed time stretcher's / pitch shifter's preview function as it's unnecessary now.
. <Jojo> When going down close to 0 Hz in the sample editor, the sample freq wrapped around to the maximum value.
. <Jojo> Insert Silence: Loop points were not updated when adding silence at the beginning of the sample
- . <Jojo> Time Stretch / Pitch Shift button's caption was not updated properly.
Instrument tab
. <Jojo> When playing an instrument and disabling its envelopes at the same time, the toggled envelopes are stopped (prevents filter envelope from turning into a pitch envelope).
@@ -92,36 +90,35 @@
Comments tab
^ <Jojo> If sample size is < 1 KB, amount of bytes is shown instead of "0 KB".
- . <Jojo> The lower part of the tab was receiving update messages that were not even meaningful to this tab (f.e. speed changes), so it was updating quite often modules that have alternating speed... Only letting in important update messages now.
+ . <Jojo> The lower part of the tab was receiving update messages that were not even meaningful to this tab (f.e. speed changes), so it was updating quite often modules that have alternating speed and the toolbar was "blinking"... Only letting in important update messages now.
Treeview
+ <Jojo> Show sequences in song treeview. Sequences can be inserted, duplicated and deleted by right-clicking the sequence items.
- + <Jojo> Clicking on a mod item (only filename node) switches to the corresponding window.
+ + <Jojo> Clicking on a mod item (i.e. a filename node) switches to the corresponding window.
+ <Jojo> Display playing samples / instruments (only those that are assigned to a sample) using green triangles. Can be enabled from setup screen.
+ <Jojo> Muted samples and instruments are shown with a different icon.
^ <Jojo> Can now dragondrop orders, even between sequences.
^ <Jojo> Double-clicking order items and pattern items should work now.
^ <Jojo> Show whole sequence (don't stop on first "---" item).
^ <Jojo> Switching between sequences should be easier now. There's a context menu entry for it and double-clicking on an empty sequence will switch to it (as there are no orderlist item to click on).
- ^ <Jojo> Different icons for effects / instruments
+ ^ <Jojo> Different icons for VST effects / instruments
VST / MIDI mapping
- ^ <Jojo> Further improvement to param mapping so that the midi dialog really only pops up when the VST window has the focus.
^ <Jojo> VST Selector: Different icons for effects / instruments.
- . <Jojo> When moving around plugins, param control notes are now also updated.
+ . <re/Jojo> When moving around plugins, param control notes are now also updated.
. <re> MIDI mapping: Pattern record checkbox wasn't updated properly.
. <re/Jojo> MIDI mapping: Shift key erroneously opened MIDI mapping dialog in some cases. However, it does not work properly with all plugins anymore (e.g. sliders in Synth1 are not shift-clickable anymore)
Mod conversion
^ <Jojo> When converting a song that has subsongs to MPTM format, the user is asked if those subsongs should be converted into multiple sequences.
- ^ <Jojo> Better conversion of MOD/XM E4x / E7x command.
+ ^ <Jojo> If possible, all MPTM sequences will be merged into the first sequence. This also tries to fix patterns with Bxx effects.
+ ^ <Jojo> Better conversion of MOD / XM E4x / E7x command.
^ <Jojo> Better conversion of note off commands when converting to .mod.
^ <Jojo> Removing channel features (pan/vol) in formats where they're not supported.
^ <Jojo> Insert pattern break commands when resizing patterns to 64 rows that were smaller.
- ^ <Jojo> Changing between MOD and XM format limits speed/tempo commands (Fxx) now.
+ ^ <Jojo> Changing between MOD and XM format limits speed / tempo commands (Fxx) properly now.
^ <Jojo> Trim sequence if it's too long (f.e. in MOD format).
- ^ <Jojo> If possible, all MPTM sequences will be merged into the first sequence. This also tries to fix patterns with Bxx effects.
- ^ <Jojo> Remove sample vibrato and sustain loops for MOD/S3M.
+ ^ <Jojo> Remove sample vibrato and sustain loops for MOD / S3M.
Playback (see also format-specific changes below)
^ <Jojo> Added some more standard playback frequencies (176KHz, 192KHz).
@@ -130,7 +127,7 @@
IT::Saving
. <Jojo> Original IT specs concerning max orders/patterns were wrong. IT can handle up to 257 orders (as the last order is always ---, so it's actually 256 accessible orders), so the saving routines were also updated a bit.
. <Jojo> Save at least 2 order items.
- . <Jojo> IT files with empty sample slots will now FINALLY save correctly in Impulse Tracker.
+ . <Jojo> IT files with empty sample slots made with MPT will now FINALLY save correctly in Impulse Tracker.
. <Jojo> Compatibility Export: Don't store "extended filter range" flag.
IT::Loading
@@ -139,19 +136,20 @@
. <Jojo> In some very rare (almost only theoretical) cases, the last IT instrument would not be loaded in previous versions. Use correct instrument header size (1.xx or 2.xx header) for comparison when loading instrument headers.
IT::Playback compatibility
- . <Jojo> Reset NNA actions on every note (tentative fix).
+ . <Jojo> Reset NNA actions on every note (tentative fix, fixes spx-farspacedance.it).
. <Jojo> Fixes from SchismTracker: VolSwing, PanSwing, PPS.
. <Jojo> Out of range offset command with Old FX on.
+ . <Jojo> Impvored S3x / S4x / S5x handling.
S3M
. <Jojo> ST3 compatibility: Only allow waveforms 0 to 3 for S3x / S4x / S5x.
- . <Jojo> The S3M format actually knows muted channels. Added this to the S3M loader/saver.
+ . <Jojo> The S3M format actually knows muted channels. This was not taking into account before.
XM::Loading
^ <Jojo> Allow to load modules with an empty order list (as they are, in fact, valid XM files).
XM::Playback compatibility
- . <Jojo> Almost perfect arpeggio emulation (only a few notes are still wrong).
+ . <Jojo> Almost perfect arpeggio emulation (only a few notes are still wrong). Thanks, Ian Luck!
. <Jojo> Rogue note delays are now retriggering the instrument.
. <Jojo> Perfect emulation of buggy Rxy behaviour. Thanks to Ian Luck for helping me with this.
. <Jojo> Command X modplug extensions are now ignored in FT2 compat mode.
@@ -175,7 +173,7 @@
+ <Jojo> Wave Convert: Normalization is back as experimental feature.
+ <Jojo> Wav/Mp3 export: Show estimated remaining time.
^ <Jojo> Mp3 export: Removed 60 minutes limit.
- . <Jojo> Mp3 export: use uint64 like in wav export (instead of uint32), to prevent wraparounds with very long modules like Skaven's "Beyond the Network".
+ . <Jojo> Mp3 export: Fixed possible issue with very long mod files (such as Skaven's "Beyond the Network").
. <Jojo> Wave Convert: The wave convert dialog had two default buttons, one of them (the "default default button") didn't make sense.
Colour setup
@@ -199,31 +197,31 @@
^ <Jojo> Tuning dialog: Using the default tuning path as default path for Import/Export dialog
Module format support
- + <Jojo> Can now import RIFF AM and RIFF AMFF files, as well as J2B files, which are compressed AM(FF) files. Added zlib 1.2.3 for J2B support.
- + <Jojo> Can now import PSM16 files.
+ + <Jojo> Can now import RIFF AM and RIFF AMFF files, as well as J2B (Jazz Jackrabbit 2 music) files, which are compressed AM(FF) files.
+ + <Jojo> Can now import PSM16 files (Silverball, early versions of Epic Pinball).
. <Jojo> MED Loader: Possible error when loading orderlist.
. <Jojo> MDL Loader: Various fixes (taken from Schism Tracker).
. <Jojo> IMF Loader: Slightly wrong instrument loader (this for once didn't break anything, though).
. <Jojo> AMF Loader: Missing break command.
Misc
- ^ <Jojo> All Loaders: Using a new template, SpaceToNullStringFixed, which filters out all null chars in song/sample/instrument/etc. names. This avoids "empty" instrument names that occured in a couple of .IT files before.
- ^ <Jojo> Mainframe: Extended paste mechanisms (mix, flood, push forward) have been moved into a sub menu.
- ^ <Jojo> Mainframe: Improved accelerator keys in the edit menu.
+ ^ <Jojo> All Loaders: Fixed string handling to filter out all null chars in song/sample/instrument/etc. names. This avoids "empty" instrument names that occured in a couple of .IT files before.
+ ^ <Jojo> Main window: Extended paste mechanisms (mix, flood, push forward) have been moved into a sub menu.
+ ^ <Jojo> Main window: Improved accelerator keys in the edit menu.
^ <Jojo> Added "split keyboard settings" dialog to the "edit" menu and updated the shortcuts there (goto was missing).
^ <re> SoundTouch: Update to version 1.5.0.
- / <Jojo> Store configuration and tuning files in %APPDATA% if possible. Can be disabled by adding UseAppDataDirectory=0 to [Paths] in mptrack.ini.
+ / <Jojo> Store configuration and tuning files in %APPDATA% if possible. Can be disabled by adding UseAppDataDirectory=0 to [Paths] in mptrack.ini ("portable mode").
/ <Jojo> Mod Creation: When clicking on the "new" button, the newly created module will be of the same type as the currently active document. Should probably be an option.
- / <Jojo> Made Graph and Pattern Randomizer shortcuts invisible.
+ / <Jojo> Made Graph and Pattern Randomizer shortcuts invisible, as they are usless.
/ <Jojo> Compatibility Export: Use module working directory in "save as" dialog.
/ <Jojo> Using MS Shell Dlg font instead of MS Sans Serif in resource file.
/ <re> Changed some "modplug tracker" strings to "OpenMPT".
. <Jojo> When using a Load/Save dialog, MPT's key handler will be disabled so that common shortcuts like F2, Ctrl+C, Ctrl+V, Esc. etc. can still be used.
- . <Jojo> Mod Loaders: Very short sample sustain loops are now also accepted (similar fix to normal loop points - fixes ckabsenc.it).
+ . <Jojo> Mod Loaders: Very short sample sustain loops are now also accepted (fixes ckabsenc.it).
. <Jojo> Mod Creation: Filling the whole mod title field with null bytes on creation to avoid funky characters in other programs.
. <Jojo> When moving program files to %APPDATA%, take care of the keyboard settings path in the INI file.
- . <Jojo> Increased "filename" string in instrument header field to 32, since CHAR[12] is not really enough for 12 letters...
- . <re> Autosave: 'Modified since last autosave'-flag wasn't updated when document was set modified using ThreadSafeSetModified.
+ . <Jojo> Fixed possible issue with long (12 chars) instrument filenames.
+ . <re> Autosave: 'Modified since last autosave'-flag wasn't always updated.
. <re> Fixes to handling of 32 chars long instrument name.
@@ -267,28 +265,27 @@
Pattern tab::Find/replace
^ <Jojo> Don't reset "replace all" flag after every search.
/ <Jojo> "Search in whole song" and "Replace all" are now enabled by default.
- . <Jojo> Works now also with high instrument numbers. Also, empty instrument numbers won't be affected by "ins+1" anymore.
+ . <Jojo> Replacing also works with high instrument numbers now. Also, empty instrument numbers won't be affected by "ins+1" anymore.
. <Jojo> Notes that cannot be used in the given format are not shown in the dropdown combo.
. <Jojo> Made comboboxes more convenient to use.
Pattern tab::Macro config
^ <Jojo> Also show the current preset for Zxx config (Z80 - ZFF).
- . <Jojo> "Show All" FX display starts at 1 instead of 0, like all other FX enumerations.
+ . <Jojo> "Show All" FX display starts at 1 instead of 0, like all other FX enumerations. (tx Rakib)
Sample tab
+ <coda> Sample drawing.
+ <coda> Add silence to sample.
+ + <Jojo> Resize sample (same dialog as "add silence")
+ <Jojo> Can now play sample from given position with Ctrl + left mouse button.
+ <Jojo> DC offset removal.
+ <Jojo> Batch export samples (shift + click on "save sample" icon).
- + <Jojo> Added setting "FinetuneStep" to INI section "Sample Editor".
- ^ <Jojo> It is now possible to resize samples to a given sample size. You can do this using the already existing "add silence" dialog.
+ + <Jojo> Added setting "FinetuneStep" to mptrack.ini section "[Sample Editor]".
^ <Jojo> Better loop point handling when deleting sample selections.
. <Jojo> Limit sample vibrato fields properly. Vibrato Sweep ranges from 0 to 255 now.
. <Jojo> Remove special chars from sample filenames so the "save as" dialog will show up on OSs < Vista.
. <Jojo> When using the spin control, frequency is not clamped to [2000, 96000] anymore.
. <Jojo> Removed tuning from up/downsampling for MOD files which detuned them when saving.
- . <Jojo> Global volume is now also being adjusted for stereo and 16-Bit samples.
. <Jojo> Transpose is now disabled when using MOD format.
Instrument tab
@@ -299,7 +296,7 @@
. <Jojo> Pitch/Pan input field allows negative values.
. <Jojo> Proper limits for IT/XM fadeout values.
. <Jojo> Playing correct note in the instrument mapping control (notable difference when editing the scale from bottom to top).
- . <Jojo> No relative values are shown for envelopes with no release node (status bar).
+ . <Jojo> No relative values are shown for envelopes with no release node (status bar). (tx xaimus)
. <Jojo> Remove special chars from sample filenames so the "save as" dialog will show up on OSs < Vista.
. <Jojo> Fixed crash in instrument view that occured if RowsPerBeat was 0.
. <re> Fix to crash that occurred when multiple windows had instrument tab of the same document open.
@@ -315,7 +312,7 @@
VST / MIDI mapping
+ <re> Editing a plug param in its editor while holding shift key will now open MIDI mapping dialog.
+ <re> Can now record MIDI mapping changes to pattern.
- / <re> Changed host IDs and a couple of related return values. If compatibility problems occur, old IDs can be set with ini-settings.
+ / <re> Changed host IDs and a couple of related return values. If compatibility problems occur, old IDs can be set with ini-settings ("HostProductString", "HostVendorString", "HostVendorVersion" in section "[VST Plugins]").
. <Jojo> Some minor tweaks and fixes to the MIDI mapping dialog.
Mod conversion
@@ -336,10 +333,10 @@
^ <Jojo> If restart position is 0 and a subtune is played (i.e. a tune separated with a "---" pattern), OpenMPT will now try to jump back to the first order of this subtune instead.
^ <Jojo> Added option to not reset all channels and variables when looping a module.
. <Jojo> 4-Bit panning didn't disable surround sound (fixed in compatibility mode in IT/MPTM/XM).
- . <Jojo> Process pattern break commands on last pattern properly.
+ . <Jojo> Don't ignore value of pattern break commands on last pattern anymore.
MPTM
- + <re> New experimental parameter controls for controlling plug params.
+ + <re> New experimental parameter controls (PC notes) for controlling plug params.
+ <re> Can now have multiple sequences in a module (access from orderlist context menu).
+ <Jojo> Allow up to 240 envelope points.
+ <Jojo> IT "Note Fade" command: This existed in IT's player routines already, but there was no way to actually use it in the editor. Triggering an invalid note would cause a note fade, so this is a new note type.
@@ -362,7 +359,7 @@
^ <Jojo> Can now load IT files with very small patterns (< 4 rows).
^ <Jojo> Setting the "last saved with" version to 1.16 (instead of "created with") if module seems to be made with the old MPT.
^ <Jojo> Reading our custom tracker version in the header now as well.
- ^ <Jojo> Detect more versions of MPT that did stupid things.
+ ^ <Jojo> Detect more versions of MPT that did stupid things (can be seen in the "last saved with" field).
^ <Jojo> Row highlighting in IT header is now recognized.
. <Jojo> Unset release env nodes for IT files made with IT 1.x, fix fadeout values.
. <Jojo> Don't set "made with modplug" flag for IT files that were made with compatibility export.
@@ -372,50 +369,42 @@
. <Jojo> OpenMPT was loading the volume column command hx (vibrato depth) as ux (vibrato speed) and also saving it like this. In the pattern editor, ux was allowed, hx was not but it should be the other way around. Now, hx is always used but ux is still loaded correctly for old modules made with MPT/OpenMPT.
IT::Playback compatibility
- ^ <Jojo> More improvements to Vibrato, Tremolo and Panbrello. Using the tables from IT_TECH.TXT.
- ^ <Jojo> Improved IT compatible retrigger (didn't work if the retrigger didn't start together with a new note).
+ ^ <Jojo> More improvements to Vibrato, Tremolo and Panbrello.
+ ^ <Jojo> Retrigger (Qxy) works like in Impulse Tracker now (when in compatible mode) (test #15)
+ ^ <Jojo> Tremor (Ixy) works like in Impulse Tracker now (when in compatible mode)
. <Jojo> Better sample vibrato compatibility. Vibrato Sweep isn't perfect yet, though.
- . <Jojo> Special case of Retrigger + Envelopes.
. <Jojo> Offset beyond sample range.
. <Jojo> Don't reset Tremolo on new note, don't ignore tremolo if note volume is 0.
. <Jojo> Ignore S[345]x with x > 3.
. <Jojo> Multisample instruments change with no entry in the instrument column (fixes spx-shuttledeparture.it) (test me).
- . <Jojo> Tremor also works properly with "old effects" on.
- . <Jojo> Fixed retrigger for Qxx when not being triggered together with a note.
. <Jojo> Pattern loop count won't be reset on pattern transition (fixes gm-trippy01.it).
. <Jojo> Tempo slides won't exceed 255 BPM in compatible mode.
- . <Jojo> Allow OpenMPT's new volume colum commands (offset etc.) to be used together with Retrigger in compatible mode again.
. <Jojo> Random waveforms (vibrato, tremolo, panbrello) (test #19).
. <Jojo> Fixed handling of very short pitch / filter envelopes (test #24).
. <Jojo> Panning fx (Xxx, S8x, pxx) override pan swing (test #20).
- . <Jojo> Improved retrigger compatibility even more (#15)
. <Jojo> SD0 / SC0 is now interpreted as SD1 / SC1 in compatibility mode (test #22).
. <Jojo> Portamento up / down resets the destination of tone portamento (test #23).
- . <Jojo> Tremor: Sounds like in IT when compatible playback mode is turned on.
. <Jojo> Out of range global volume, local global volume slides.
- . <Jojo> Retrigger effect behaved slightly wrong.
S3M::Saving
^ <Jojo> Orderlist is now as small as possible (multiple of 2 instead of multiple of 16); Using ST3's default UltraClick value.
^ <Jojo> Using an own version number in the header now, just like all the other trackers.
^ <Jojo> Don't write unnecessary invalid order items in the order table.
- . <Jojo> Set the stereo flag.
. <Jojo> Ignore new MPT effects.
- . <Jojo> Patterns are now saved correctly. Previously, the last few rows might have come up as garbage in ST3, especially (only?) when they were empty.
+ . <Jojo> Patterns are now saved correctly. Previously, the last few rows might have come up as garbage in ST3 when they were empty.
. <Jojo> Clamp sample pre-amp to [32;127] instead of just taking the lower 7 bits. (Default pre-amp value was 128, which resulted in pre-amp 0 when saving).
S3M::Loading
^ <Jojo> Recognize OpenMPT version in S3M header.
- . <Jojo> Limit min sample preamp value to 0x10.
+ . <Jojo> Limit min sample preamp value to 16.
. <Jojo> Small modifications to pattern loader to load somewhat broken S3M files (fix from xmp).
- . <Jojo> Don't reset global volume to max if it is min for "new" modules.
- . <Jojo> Smarter Zxx conversion.
+ . <Jojo> Don't reset global volume to max if it is 0 for "new" S3M modules.
+ . <Jojo> Smarter Zxx conversion without message box.
. <Jojo> Disable loop for sample with very short loop at the beginning.
. <Jojo> Samples with very short loops (2 bytes) will now load correctly. This fixes for example 94hitmix.s3m and spectral.s3m.
- . <Jojo> Short loops in S3M samples are now recognized.
S3M::Misc
- . <Jojo> Module Creation / Loading: Sane default volume settings for MOD / S3M files again(128 global volume, 48 sample volume)
+ . <Jojo> Module Creation / Loading: Sane default volume settings for MOD / S3M files again (128 global volume, 48 sample volume)
. <Jojo> S3M compatibility: Notes with SD0 are now ignored, SC0 is completely ignored
XM
@@ -423,13 +412,9 @@
+ <Jojo> Compatibility play-mode.
XM::Loading
- + <Jojo> Detects compatibility mode automatically when loading XM-file.
- ^ <Jojo> Detect non-mpt modules more reliably.
- ^ <Jojo> Advanced "made with MPT" detection.
- ^ <Jojo> Detect a very old MPT version.
+ + <Jojo> Detects compatibility (i.e. modules not made with mpt) mode automatically when loading XM-file.
^ <Jojo> Make XMs with strange pattern header sizes load correctly (removed some code that was there to make really, really broken XMs load - would this work at all?).
^ <Jojo> Setting the "last saved with" version to 1.16 (instead of "created with") if module seems to be made with the old MPT.
- ^ <Jojo> Less hacky implementation of the instrument loader. Still works correctly with "normal" XM modules and BoobieSqueezed XMs.
. <Jojo> Various changes to make XMs that have been compressed with BoobieSqueezer load correctly.
. <Jojo> Can now load XM Version 1.02 and 1.03.
. <Jojo> More intelligent conversion of Speed / Tempo commands.
@@ -445,21 +430,20 @@
XM::Playback compatibility
. <Jojo> Portamento + New Note with no previous note (tentative fix), Offset beyond sample range.
- . <Jojo> Compatible Arpeggio was done wrong.
- . <Jojo> More compatible "Note Off + Something".
+ . <Jojo> More compatible "Note Off + Something" actions.
. <Jojo> Note Off with instrument number causes fadeout for samples that have no envelope.
. <Jojo> Volume command Ux should not enable Vibrato at all, it only sets the vibrato speed.
. <Jojo> Pxy effect was too deep.
. <Jojo> Using MilkyTracker's arpeggio logic for better XM arpeggio compatibility - still not perfect!
. <Jojo> Tempo slides won't exceed 255 BPM in compatible mode.
- . <Jojo> In compatible mode, old retrigger routines are used again (as MPT's default retrigger algorithm actually represents FT2's retrigger algorithm). Additionally, a retrigger bug from FT2 is emulated (retrigger with vxx on the same channel would always reset the retriggered note's volume).
+ . <Jojo> In compatibility mode, retrigger with vxx on the same channel will always reset the retriggered note's volume.
. <Jojo> More compatible handling of Kxx effect.
. <Jojo> Pattern loops are now handeled correctly (using compatibility switch).
. <Jojo> Out of range global volume, local global volume slides.
MOD
^ <Jojo> Module Creation: MOD files have 4 channels by default.
- ^ <Jojo> Moved loop length check from compatibility export to normal save, as it does not break/change any MPT-made MOD file.
+ ^ <Jojo> Moved loop length check from compatibility export to normal save. There you go, Amiga users! :)
. <Jojo> Module Creation / Loading: Sane default volume settings for MOD / S3M files again (128 global volume, 48 sample volume).
. <Jojo> Inserting more than 128 orders in MOD format is not possible anymore.
@@ -468,7 +452,7 @@
. <Jojo> Last pattern was not loading in .MODs that have no samples.
MOD::Saving
- . <Jojo> The compatibility export was only working properly for 8-bit mono samples. Everything else is going to be downsampled later, so the sample "fixing" has to be done before.
+ . <Jojo> The compatibility export was only working properly for 8-bit mono samples.
. <Jojo> More intelligent conversion of Speed / Tempo commands.
. <Jojo> F20 won't turn into G20.
@@ -478,17 +462,17 @@
Setup
+ <Jojo> New default directories: plugins and plugin presets.
- + <Jojo> Option reset ramping and resampling to default values.
- + <Jojo> Shareable color schemes (via config dialog).
+ + <Jojo> Button to reset ramping and resampling to default values.
+ + <Jojo> Shareable colour schemes (via config dialog).
^ <Jojo> Added note to "always center active row" hint that this is required to be enabled for greyed out patterns.
^ <Jojo> Slight redesign of the WAV / MP3 export dialogs.
/ <Jojo> Changes to default general options configuration.
Module format support
+ <Jojo> Can now import IMF (Imago Orpheus) modules.
- + <Jojo> Can now import GDM files.
+ + <Jojo> Can now import GDM (General Digital Music / BWSB sound system) files.
. <Jojo> A brand new PSM loader! Ditched the old and buggy loader as the new loader works way better, it can even handle modules from Extreme Pinball.
- . <Jojo> 669 Loader: Small modification so corehop.669 can be loaded; Note: Loader is still buggy like hell
+ . <Jojo> 669 Loader: Small modification so corehop.669 can be loaded; Note: Loader is still buggy like hell.
Misc
+ <Jojo> Compo cleanup.
@@ -502,7 +486,7 @@
^ <kode54> LHA Decoder: Several fixes (patch by kode54).
/ <re> Default keybings are now included in the executable -> default keybindings are available even without external keybinding file.
. <Jojo> Menus: Added the correct shortcut keys again and replaced the last(?) remaining "Midi" labels by "MIDI".
- . <Jojo> Wav Export / Channel Manager / Pattern Editor: Pattern names with leading space char are now accepted.
+ . <Jojo> Wav Export / Channel Manager / Pattern Editor: Channel names with leading space char are now accepted.
. <Jojo> General tab / Main bar / Loaders / Conversion: Fixed arbitrary speed limits (64 on general tab, 127 on main bar).
. <Jojo> Keyboard manager: Octave offset for key descriptions is now C, not A.
. <Jojo> Patterns: Reset pattern name when deleting pattern.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-10 18:21:37
|
Revision: 463
http://modplug.svn.sourceforge.net/modplug/?rev=463&view=rev
Author: saga-games
Date: 2010-01-10 18:21:30 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
[Mod] Corrected some stuff in history.txt (types, "between releases" fixes, clarifications, etc...)
Modified Paths:
--------------
trunk/OpenMPT/packageTemplate/History.txt
Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt 2010-01-10 17:21:21 UTC (rev 462)
+++ trunk/OpenMPT/packageTemplate/History.txt 2010-01-10 18:21:30 UTC (rev 463)
@@ -18,7 +18,7 @@
Sequence editor
+ <re> Can now copy/cut/paste order selections.
^ <Jojo> Using the keyboard manager for shortcuts. 0...9, + and - keys are now also configurable.
- ^ <Jojo> Duplicate / Create new pattern shortcuts do also work now here.
+ ^ <Jojo> Duplicate / Create new pattern shortcuts do also work here now.
^ <Jojo> Show cut/copy/paste orders in context menu.
^ <Jojo> Middle click can now also be used for queuing patterns.
. <Jojo> Show correct shortcuts in context menus
@@ -70,27 +70,25 @@
. <Jojo> When in sample mode, samples were never stopped when in new-style note off mode, which lead to sample jam when using long/looped samples.
Sample tab
- + <Jojo> Sample Undo. 100 steps per sample (independent), undo buffer is cut off at a tenth of physical memory (that would be 400 MB for a system with 4 GB of RAM). Cutoff size can be specified by setting UndoBufferSize (in Megabytes) in section [Sample Editor] <Jojo> of mptrack.ini.
+ + <Jojo> Sample Undo. 100 steps per sample (independent), undo buffer is cut off at a tenth of physical memory (that would be 400 MB for a system with 4 GB of RAM). Cutoff size can be specified by setting UndoBufferSize (in Megabytes) in section [Sample Editor] of mptrack.ini.
^ <Jojo> When creating a new sample using "resize", sample loop is activated automatically.
^ <Jojo> When sample is 8-bit, it will automatically be converted to 16-bit when applying time stretching / pitch shifting.
^ <Jojo> Can now enter insanely high values into sample frequency input field (as they are supported by Impulse Tracker), allow only 65536 Hz for S3M files.
/ <Jojo> Removed time stretcher's / pitch shifter's preview function as it's unnecessary now.
. <Jojo> When going down close to 0 Hz in the sample editor, the sample freq wrapped around to the maximum value.
. <Jojo> Insert Silence: Loop points were not updated when adding silence at the beginning of the sample
- . <Jojo> Pitch shift: Was slightly broken for 8-bit samples.
. <Jojo> Time Stretch / Pitch Shift button's caption was not updated properly.
Instrument tab
- . <Jojo> When playing an instrument and disabling its envelopes at the same time, they're stopped (prevents filter envelope from turning into a pitch envelope).
+ . <Jojo> When playing an instrument and disabling its envelopes at the same time, the toggled envelopes are stopped (prevents filter envelope from turning into a pitch envelope).
. <re> Sample map was broken when dealing with sample indexes greater than 255.
. <Jojo> Update plugin list properly when cleaning up plugins while being on the instrument tab (possibly also improves instrument tab behaviour when working with multiple windows).
Instrument tab::Envelope editor
+ <Jojo> Envelopes can be edited using keyboard. Various keyboard shortcuts have been added to move and edit envelope points. This uses a common "drag and drop" node with mouse editing, so a point can first be clicked and the be moved with f.e. cursor keys.
^ <Jojo> When creating a new envelope, automatically enable it as well.
- ^ <Jojo> Mark currently selected envelope node yellow for better visibility.
+ ^ <Jojo> Mark currently selected envelope node yellow for better visibility when using keyboard editing.
/ <Jojo> Middle line is also shown for volume envelope.
- . <Jojo> When pasting envelopes, the enabled and filter flags were lost.
Comments tab
^ <Jojo> If sample size is < 1 KB, amount of bytes is shown instead of "0 KB".
@@ -99,7 +97,7 @@
Treeview
+ <Jojo> Show sequences in song treeview. Sequences can be inserted, duplicated and deleted by right-clicking the sequence items.
+ <Jojo> Clicking on a mod item (only filename node) switches to the corresponding window.
- + <Jojo> Display playing samples / instruments (only those that are assigned to a sample). Can be enabled from setup screen.
+ + <Jojo> Display playing samples / instruments (only those that are assigned to a sample) using green triangles. Can be enabled from setup screen.
+ <Jojo> Muted samples and instruments are shown with a different icon.
^ <Jojo> Can now dragondrop orders, even between sequences.
^ <Jojo> Double-clicking order items and pattern items should work now.
@@ -108,12 +106,11 @@
^ <Jojo> Different icons for effects / instruments
VST / MIDI mapping
- ^ <Jojo> VST Editor: When dealing with midi learn in vst editors (with Shift key), also accept child windows of the VST editor as valid window. This still doesn't fix the Shift+clicking sliders issue in Synth1, but might help with other plugins.
- ^ <Jojo> Further improvement to param mapping so that the midi dialog really only pops up when the VST window has the focus.
- ^ <Jojo> VST Selector: Different icons for effects / instruments.
- . <Jojo> When moving around plugins, param control notes are now also updated.
- . <re> MIDI mapping: Pattern record checkbox wasn't updated properly.
- . <re> MIDI mapping: Shift key erroneously opened MIDI mapping dialog in some cases.
+ ^ <Jojo> Further improvement to param mapping so that the midi dialog really only pops up when the VST window has the focus.
+ ^ <Jojo> VST Selector: Different icons for effects / instruments.
+ . <Jojo> When moving around plugins, param control notes are now also updated.
+ . <re> MIDI mapping: Pattern record checkbox wasn't updated properly.
+ . <re/Jojo> MIDI mapping: Shift key erroneously opened MIDI mapping dialog in some cases. However, it does not work properly with all plugins anymore (e.g. sliders in Synth1 are not shift-clickable anymore)
Mod conversion
^ <Jojo> When converting a song that has subsongs to MPTM format, the user is asked if those subsongs should be converted into multiple sequences.
@@ -121,12 +118,10 @@
^ <Jojo> Better conversion of note off commands when converting to .mod.
^ <Jojo> Removing channel features (pan/vol) in formats where they're not supported.
^ <Jojo> Insert pattern break commands when resizing patterns to 64 rows that were smaller.
- ^ <Jojo> Changing between MOD and XM format limits CMD_SPEED/CMD_TEMPO properly now.
- ^ <Jojo> Trim sequence if it's too long.
- ^ <Jojo> Detect and fix patterns with Bxx effect properly when merging sequences.
- ^ <Jojo> If possible, all MPTM sequences will be merged into the first sequence.
+ ^ <Jojo> Changing between MOD and XM format limits speed/tempo commands (Fxx) now.
+ ^ <Jojo> Trim sequence if it's too long (f.e. in MOD format).
+ ^ <Jojo> If possible, all MPTM sequences will be merged into the first sequence. This also tries to fix patterns with Bxx effects.
^ <Jojo> Remove sample vibrato and sustain loops for MOD/S3M.
- ^ <Jojo> When converting to .MOD, order list won't be too long anymore.
Playback (see also format-specific changes below)
^ <Jojo> Added some more standard playback frequencies (176KHz, 192KHz).
@@ -141,7 +136,7 @@
IT::Loading
^ <Jojo> Removed unnecessary / wrong pre-amp limits.
. <Jojo> IT files with global volume 0 are now loaded correctly.
- . <Jojo> Use correct header size (1.xx or 2.xx header) for comparison when checking instrument headers.
+ . <Jojo> In some very rare (almost only theoretical) cases, the last IT instrument would not be loaded in previous versions. Use correct instrument header size (1.xx or 2.xx header) for comparison when loading instrument headers.
IT::Playback compatibility
. <Jojo> Reset NNA actions on every note (tentative fix).
@@ -150,17 +145,15 @@
S3M
. <Jojo> ST3 compatibility: Only allow waveforms 0 to 3 for S3x / S4x / S5x.
- . <Jojo> The S3M format actually knows muted channels. Added this to the S3M loader/saver and MuteChannel functions.
+ . <Jojo> The S3M format actually knows muted channels. Added this to the S3M loader/saver.
XM::Loading
^ <Jojo> Allow to load modules with an empty order list (as they are, in fact, valid XM files).
XM::Playback compatibility
- . <Jojo> A somewhat more compatible Rxy effect. Still needs more testing, as it's approximately the same algorithm as in Milky (which I know is not 100% correct).
. <Jojo> Almost perfect arpeggio emulation (only a few notes are still wrong).
- . <Jojo> Rogue note delays.
+ . <Jojo> Rogue note delays are now retriggering the instrument.
. <Jojo> Perfect emulation of buggy Rxy behaviour. Thanks to Ian Luck for helping me with this.
- . <Jojo> Slightly improved Rxy behaviour.
. <Jojo> Command X modplug extensions are now ignored in FT2 compat mode.
MOD
@@ -172,9 +165,6 @@
+ <Jojo> Added song flag "PT 1.x Mode" (for .MOD files) that enabled on-the-fly sample swapping as ProTracker did it.
+ <Jojo> Support for the EFx command (Invert Loop). One has to pay attention when working with this command as it effictively trashes samples.
^ <Jojo> MOD Playback: if PT1.x playback flag is set, 8xx and E8x panning commands are now ignored.
- ^ <Jojo> MOD Playing: Some more (minor) tweaks for Invert Loop. Thanks again, bubsy!.
- . <Jojo> Further fixes to "Invert Loop" command (thanks, bubsy).
- . <Jojo> Improvements to the "Invert Loop" effect (was only applied on rows with EFx).
Module cleanup
+ <Jojo> New cleanup feature: Merge sequences.
@@ -191,7 +181,7 @@
Colour setup
+ <Jojo> Channel separators can now have custom colors.
+ <Jojo> Can now specify the blend colour for prev/next patterns.
- / <Jojo> Changed FT2 and IT presets to resemble those two trackers as much as possible.
+ / <Jojo> Renamed FT2 and IT presets to "Blue" and "Green", as they did not resemble FT2 and IT in any way.
/ <Jojo> Added VU Meter colours for the pattern colour presets.
/ <Jojo> Changed the "Buzz" colour scheme a bit.
. <Jojo> When loading colour presets that have less colours are defined than required, the missing colours will be replaced by those from the "MPT" preset.
@@ -199,6 +189,7 @@
Keymaps
+ <Jojo> Two new keymaps: French Laptop by Paul Legovitch, Norwegian MPT Classic by Rakib.
+ / <Jojo> Updated DE_jojo.mkb
^ <Jojo> When loading a keymap file and unrecognized lines are found, only one messagebox is shown.
/ <Jojo> All keymaps have been updated to version 1 and updated to contain the orderlist shortcuts.
. <Jojo> Keymap files have a version number now (currently version 1). If keymap file doesn't have a version number (that's version 0), the orderlist keys will be added automatically so that orderlist remains usable in new builds.
@@ -211,7 +202,6 @@
+ <Jojo> Can now import RIFF AM and RIFF AMFF files, as well as J2B files, which are compressed AM(FF) files. Added zlib 1.2.3 for J2B support.
+ <Jojo> Can now import PSM16 files.
. <Jojo> MED Loader: Possible error when loading orderlist.
- . <Jojo> PSM16 Loader: It was possible to load corrupted modules with > MAX_BASECHANNELS channels (up to 0xFFFF).
. <Jojo> MDL Loader: Various fixes (taken from Schism Tracker).
. <Jojo> IMF Loader: Slightly wrong instrument loader (this for once didn't break anything, though).
. <Jojo> AMF Loader: Missing break command.
@@ -229,7 +219,7 @@
/ <Jojo> Using MS Shell Dlg font instead of MS Sans Serif in resource file.
/ <re> Changed some "modplug tracker" strings to "OpenMPT".
. <Jojo> When using a Load/Save dialog, MPT's key handler will be disabled so that common shortcuts like F2, Ctrl+C, Ctrl+V, Esc. etc. can still be used.
- . <Jojo> Mod Loaders: Very short sample sustain loops are now also accepted (similar fix to normal loop points).
+ . <Jojo> Mod Loaders: Very short sample sustain loops are now also accepted (similar fix to normal loop points - fixes ckabsenc.it).
. <Jojo> Mod Creation: Filling the whole mod title field with null bytes on creation to avoid funky characters in other programs.
. <Jojo> When moving program files to %APPDATA%, take care of the keyboard settings path in the INI file.
. <Jojo> Increased "filename" string in instrument header field to 32, since CHAR[12] is not really enough for 12 letters...
@@ -242,7 +232,7 @@
General tab
^ <Jojo> "Modtype" dialog will revert mod flags to previous values if user presses the Cancel button.
- ^ <Jojo> Modtype Dialog: Added suffixes IT and S3M to some mod flags for more clarity.
+ ^ <Jojo> Modtype Dialog: Added suffixes "IT" and "S3M" to some mod flags for more clarity.
. <Jojo> VSTi / Sample volume sliders only go up to 255 instead of 256.
. <Jojo> Document will now be set modified when moving or inserting plugins.
@@ -261,7 +251,7 @@
/ <Jojo> Entering note with row spacing enabled can now move cursor to next pattern if continuous scroll is enabled.
. <Jojo> Inserting a new pattern won't resize it to 32 rows anymore if the current pattern has less than 32 rows.
. <Jojo> Show "offset" and "velocity" volume commands in default color instead of "pitch" color.
- . <Jojo> Weird combination of context menu shortcut and "always center active row" being disabled (http://lpchip.com/modplug/viewtopic.php?t=3203).
+ . <Jojo> Fixed weird combination of context menu shortcut and "always center active row" being disabled (http://lpchip.com/modplug/viewtopic.php?t=3203).
. <Jojo> Keyboard split note was off by one.
. <Jojo> Set max. row spacing / skipping value to 64, visibly clamp values > 64 to 64 in the edit box.
@@ -329,7 +319,7 @@
. <Jojo> Some minor tweaks and fixes to the MIDI mapping dialog.
Mod conversion
- ^ <Jojo> Convert E9x to Q8x as Q0x actually means "continue" and note "no change" for the volume change.
+ ^ <Jojo> Convert E9x to Q8x as Q0x actually means "continue" and not "no change" for the volume change.
^ <Jojo> Even better conversion of various pattern effects, including 8-Bit Panning, Arpeggio (XM swaps the two parameters) including Surround, Note Cut/Off/Fade conversion, MOD retrigger, XM->IT volume column limitations, illegal notes).
^ <Jojo> Proper conversion of Pxy effect.
^ <Jojo> Full volume column conversion, resetting default global volume / tempo / speed for MOD files.
@@ -337,7 +327,7 @@
^ <Jojo> Somewhat decent conversion of Kxx (Key Off) from XM to S3M/IT.
^ <Jojo> Trim instrument envelopes if they're too long for the new format.
^ <Jojo> Convert 500/600 commands properly from MOD to any format, Adjust sustain loops for XM files, removed XM arpeggio conversion (it might be unwanted).
- ^ <Jojo> Try to use fix commands that don't have cache (00 value) in XM (Arpeggio) and MOD format (Arpeggio and a few others) by using the previous value.
+ ^ <Jojo> Try to use fix commands that don't have a "memory" (00 value) in XM (Arpeggio) and MOD format (Arpeggio and a few others) by using the previous value.
. <Jojo> Proper conversion between IT 8-Bit panning effect and S3M 7-Bit panning effect with surround.
. <Jojo> Unset release nodes were corrupted when converting modules.
@@ -371,8 +361,8 @@
IT::Loading
^ <Jojo> Can now load IT files with very small patterns (< 4 rows).
^ <Jojo> Setting the "last saved with" version to 1.16 (instead of "created with") if module seems to be made with the old MPT.
- ^ <Jojo> Reading our custom tracker version now as well.
- ^ <Jojo> Detect more version of MPT that did stupid things.
+ ^ <Jojo> Reading our custom tracker version in the header now as well.
+ ^ <Jojo> Detect more versions of MPT that did stupid things.
^ <Jojo> Row highlighting in IT header is now recognized.
. <Jojo> Unset release env nodes for IT files made with IT 1.x, fix fadeout values.
. <Jojo> Don't set "made with modplug" flag for IT files that were made with compatibility export.
@@ -387,11 +377,8 @@
. <Jojo> Better sample vibrato compatibility. Vibrato Sweep isn't perfect yet, though.
. <Jojo> Special case of Retrigger + Envelopes.
. <Jojo> Offset beyond sample range.
- . <Jojo> Removed a "fix" again that was causing to completely destroy panbrello.
- . <Jojo> Don't reset channel panning if panbrello ends (experimental).
. <Jojo> Don't reset Tremolo on new note, don't ignore tremolo if note volume is 0.
- . <Jojo> Fixed Tremolo, Vibrato and Panbrello tables.
- . <Jojo> Ignore S [345]x with x > 3.
+ . <Jojo> Ignore S[345]x with x > 3.
. <Jojo> Multisample instruments change with no entry in the instrument column (fixes spx-shuttledeparture.it) (test me).
. <Jojo> Tremor also works properly with "old effects" on.
. <Jojo> Fixed retrigger for Qxx when not being triggered together with a note.
@@ -415,15 +402,15 @@
. <Jojo> Set the stereo flag.
. <Jojo> Ignore new MPT effects.
. <Jojo> Patterns are now saved correctly. Previously, the last few rows might have come up as garbage in ST3, especially (only?) when they were empty.
- . <Jojo> Clamp sample pre-amp to [32;127] instead of just taking the lower 7 bits. (Default pre-amp value as 128, which resulted in pre-amp 0 when saving).
+ . <Jojo> Clamp sample pre-amp to [32;127] instead of just taking the lower 7 bits. (Default pre-amp value was 128, which resulted in pre-amp 0 when saving).
S3M::Loading
^ <Jojo> Recognize OpenMPT version in S3M header.
. <Jojo> Limit min sample preamp value to 0x10.
- . <Jojo> Small modifications to pattern loader to load somewhat broken S3M files.
+ . <Jojo> Small modifications to pattern loader to load somewhat broken S3M files (fix from xmp).
. <Jojo> Don't reset global volume to max if it is min for "new" modules.
. <Jojo> Smarter Zxx conversion.
- . <Jojo> Disable loop for files with very short loop at the beginning of the sample.
+ . <Jojo> Disable loop for sample with very short loop at the beginning.
. <Jojo> Samples with very short loops (2 bytes) will now load correctly. This fixes for example 94hitmix.s3m and spectral.s3m.
. <Jojo> Short loops in S3M samples are now recognized.
@@ -443,16 +430,14 @@
^ <Jojo> Make XMs with strange pattern header sizes load correctly (removed some code that was there to make really, really broken XMs load - would this work at all?).
^ <Jojo> Setting the "last saved with" version to 1.16 (instead of "created with") if module seems to be made with the old MPT.
^ <Jojo> Less hacky implementation of the instrument loader. Still works correctly with "normal" XM modules and BoobieSqueezed XMs.
- . <Jojo> Various changes to make XMs that have been compressed with BoobieSqueezer load correctly. Should not break anything, but I call it "experimental".
+ . <Jojo> Various changes to make XMs that have been compressed with BoobieSqueezer load correctly.
. <Jojo> Can now load XM Version 1.02 and 1.03.
. <Jojo> More intelligent conversion of Speed / Tempo commands.
- . <Jojo> Don't ignore last pattern if XM has no instruments.
+ . <Jojo> Don't ignore last pattern if XM file has no instruments.
XM::Saving
^ <Jojo> Compatibility export: Export cuts off channels > 32.
- ^ <Jojo> Setting "Open ModPlug Tracker" in the "made with" field (as any other tracker put their signature in here as well).
- ^ <Jojo> Include version number in "made with" string.
- ^ <Jojo> When channel count is odd, the empty channel is now always the last one.
+ ^ <Jojo> Setting "OpenMPT <version number>" in the "made with" field (as any other tracker put their signature in here as well).
. <Jojo> Always save with a channel number that's a multiple of two so FT2 will load the file correctly.
. <Jojo> F20 won't turn into G20.
. <Jojo> Limit fadeout values properly.
@@ -469,14 +454,13 @@
. <Jojo> Tempo slides won't exceed 255 BPM in compatible mode.
. <Jojo> In compatible mode, old retrigger routines are used again (as MPT's default retrigger algorithm actually represents FT2's retrigger algorithm). Additionally, a retrigger bug from FT2 is emulated (retrigger with vxx on the same channel would always reset the retriggered note's volume).
. <Jojo> More compatible handling of Kxx effect.
- . <Jojo> Pattern loops are now handeled correctly in XM (using compatibility switch) and MOD files.
+ . <Jojo> Pattern loops are now handeled correctly (using compatibility switch).
. <Jojo> Out of range global volume, local global volume slides.
- . <Jojo> Arpeggio was played wrong (0xy should play base note - y - x, not base note - x - y).
MOD
^ <Jojo> Module Creation: MOD files have 4 channels by default.
^ <Jojo> Moved loop length check from compatibility export to normal save, as it does not break/change any MPT-made MOD file.
- . <Jojo> Module Creation / Loading: Sane default volume settings for MOD / S3M files again(128 global volume, 48 sample volume).
+ . <Jojo> Module Creation / Loading: Sane default volume settings for MOD / S3M files again (128 global volume, 48 sample volume).
. <Jojo> Inserting more than 128 orders in MOD format is not possible anymore.
MOD::Loading
@@ -490,7 +474,7 @@
MOD::Playback compatibility
. <Jojo> 8-Bit Panning is not 7-Bit panning (using 800...8FF instead of 800...880 - fixes f.e. DOPE.MOD).
- . <Jojo> Pattern loops are now handeled correctly in XM (using compatibility switch) and MOD files.
+ . <Jojo> Pattern loops are now handeled correctly.
Setup
+ <Jojo> New default directories: plugins and plugin presets.
@@ -508,10 +492,10 @@
Misc
+ <Jojo> Compo cleanup.
- + <Jojo> Rearrange samples is back! And this time, it's even fully functional!.
+ + <Jojo> Rearrange samples is back! And this time, it's even fully functional!
^ <Jojo> XI Saver: Fill out the "created with" field properly (OpenMPT instead of FastTracker 2).
- ^ <Jojo> Write ID3v2.4 instead of ID3v1 tags. Includes various changes to length limits, genre limitations and what's written in the tags.
- ^ <Jojo> Mod Specs: Decreased minimum pattern size for XM and IT format to 1 row. Experimental, but should not break anything (needs more testing).
+ ^ <Jojo> MP3 export: Write ID3v2.4 instead of ID3v1 tags. Includes various changes to length limits, genre limitations and what's written in the tags.
+ ^ <Jojo> Mod Specs: Decreased minimum pattern size for XM and IT format to 1 row.
^ <Jojo> Mod Specs: It is now possible to have modules with 1-3 channels, as this only seems to cause trouble with MOD files (so they still have 4 channels minimum of course).
^ <Jojo> Autosave: If a module has not been changed since the last autosave, it will not be autosaved.
^ <Jojo> Module loader: If plugins are missing, a single MessageBox is shown.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rel...@us...> - 2010-01-10 17:21:35
|
Revision: 462
http://modplug.svn.sourceforge.net/modplug/?rev=462&view=rev
Author: relabsoluness
Date: 2010-01-10 17:21:21 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
[Mod] Pattern editor: In parameter control note interpolation, overwrite parameter control notes which have zero in instrument column.
[Mod] SoundTouch: Now using its own DLL interface.
[Mod] Wav export: Added "experimental"-note to normalization.
[Mod] General: Updated about box and added Changes-message box.
[Mod] Package template: Update to history.txt.
[Fix] Sample tab: Actions such as time stretching and undo could trigger sample play due to a bug in ctrlChn::ReplaceSample.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/mptrack/mptrack.vcproj
trunk/OpenMPT/mptrack/res/MPTRACK.RC2
trunk/OpenMPT/mptrack/resource.h
trunk/OpenMPT/packageTemplate/History.txt
trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
trunk/OpenMPT/soundtouch/FIFOSamplePipe.h
trunk/OpenMPT/soundtouch/STTypes.h
trunk/OpenMPT/soundtouch/SoundTouch.h
trunk/OpenMPT/soundtouch/soundtouch.vcproj
trunk/OpenMPT/soundtouch/soundtouch_08.vcproj
Added Paths:
-----------
trunk/OpenMPT/soundtouch/SoundTouchDLL.cpp
trunk/OpenMPT/soundtouch/SoundTouchDLL.h
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-01-10 17:21:21 UTC (rev 462)
@@ -11,6 +11,7 @@
#include "mpdlgs.h"
#include "soundtouch/SoundTouch.h"
#include "soundtouch/TDStretch.h"
+#include "soundtouch/SoundTouchDLL.h"
#pragma warning(disable:4244) //"conversion from 'type1' to 'type2', possible loss of data"
#include "smbPitchShift.cpp"
#pragma warning(default:4244) //"conversion from 'type1' to 'type2', possible loss of data"
@@ -1772,6 +1773,7 @@
int CCtrlSamples::TimeStretch(double ratio)
//-----------------------------------------
{
+ static HANDLE handleSt = NULL; // Handle to SoundTouch object.
if((!m_pSndFile) || (!m_pSndFile->Samples[m_nSample].pSample)) return -1;
MODSAMPLE *pSmp = &m_pSndFile->Samples[m_nSample];
if(!pSmp) return -1;
@@ -1792,14 +1794,16 @@
if(pitch < 0.5f) return 2 + (1<<8);
if(pitch > 2.0f) return 2 + (2<<8);
- soundtouch::SoundTouch* pSoundTouch = 0;
- try
+ if (handleSt != NULL && soundtouch_isEmpty(handleSt) == 0)
+ return 10;
+
+ if (handleSt == NULL)
{
- pSoundTouch = new soundtouch::SoundTouch;
+ handleSt = soundtouch_createInstance();
}
- catch(...)
- { // Assuming that thrown exception means that soundtouch library could not be loaded.
- MessageBox("Failed to load soundtouch library.", 0, MB_ICONERROR);
+ if (handleSt == NULL)
+ {
+ AfxMessageBox(IDS_SOUNDTOUCH_LOADFAILURE);
return -1;
}
@@ -1833,10 +1837,7 @@
//const DWORD nNewSampleLength = (DWORD)(0.5 + ratio * (double)pSmp->nLength);
PVOID pNewSample = CSoundFile::AllocateSample(nNewSampleLength * nChn * smpsize);
if(pNewSample == NULL)
- {
- delete pSoundTouch;
return 3;
- }
// Save process button text (to be used as "progress bar" indicator while processing)
CHAR oldText[255];
@@ -1866,16 +1867,15 @@
{
if(nSampleRate < 300) // Too low samplerate crashes soundtouch.
{ // Limiting it to value 300(quite arbitrarily chosen).
- delete pSoundTouch;
return 5;
}
- pSoundTouch->setSampleRate(nSampleRate);
- pSoundTouch->setChannels(nChn);
+ soundtouch_setSampleRate(handleSt, nSampleRate);
+ soundtouch_setChannels(handleSt, nChn);
// Given ratio is time stretch ratio, and must be converted to
// tempo change ratio: for example time stretch ratio 2 means
// tempo change ratio 0.5.
- pSoundTouch->setTempoChange( (1.0f / ratio - 1.0f) * 100.0f);
- pSoundTouch->setSetting(SETTING_USE_QUICKSEEK, 0);
+ soundtouch_setTempoChange(handleSt, (1.0f / ratio - 1.0f) * 100.0f);
+ soundtouch_setSetting(handleSt, SETTING_USE_QUICKSEEK, 0);
// Read settings from GUI.
ReadTimeStretchParameters();
@@ -1887,16 +1887,16 @@
// Set settings to soundtouch. Zero value means 'use default', and
// setting value is read back after setting because not all settings are accepted.
if(m_nSequenceMs == 0) m_nSequenceMs = DEFAULT_SEQUENCE_MS;
- pSoundTouch->setSetting(SETTING_SEQUENCE_MS, m_nSequenceMs);
- m_nSequenceMs = pSoundTouch->getSetting(SETTING_SEQUENCE_MS);
+ soundtouch_setSetting(handleSt, SETTING_SEQUENCE_MS, m_nSequenceMs);
+ m_nSequenceMs = soundtouch_getSetting(handleSt, SETTING_SEQUENCE_MS);
if(m_nSeekWindowMs == 0) m_nSeekWindowMs = DEFAULT_SEEKWINDOW_MS;
- pSoundTouch->setSetting(SETTING_SEEKWINDOW_MS, m_nSeekWindowMs);
- m_nSeekWindowMs = pSoundTouch->getSetting(SETTING_SEEKWINDOW_MS);
+ soundtouch_setSetting(handleSt, SETTING_SEEKWINDOW_MS, m_nSeekWindowMs);
+ m_nSeekWindowMs = soundtouch_getSetting(handleSt, SETTING_SEEKWINDOW_MS);
if(m_nOverlapMs == 0) m_nOverlapMs = DEFAULT_OVERLAP_MS;
- pSoundTouch->setSetting(SETTING_OVERLAP_MS, m_nOverlapMs);
- m_nOverlapMs = pSoundTouch->getSetting(SETTING_OVERLAP_MS);
+ soundtouch_setSetting(handleSt, SETTING_OVERLAP_MS, m_nOverlapMs);
+ m_nOverlapMs = soundtouch_getSetting(handleSt, SETTING_OVERLAP_MS);
// Update GUI with the actual SoundTouch parameters in effect.
UpdateTimeStretchParameterString();
@@ -1926,22 +1926,23 @@
::GdiFlush();
// Send sampledata for processing.
- pSoundTouch->putSamples(reinterpret_cast<int16*>(pSmp->pSample + pos * smpsize * nChn), len);
+ soundtouch_putSamples(handleSt, reinterpret_cast<int16*>(pSmp->pSample + pos * smpsize * nChn), len);
// Receive some processed samples (it's not guaranteed that there is any available).
- nLengthCounter += pSoundTouch->receiveSamples(reinterpret_cast<int16*>(pNewSample) + nChn * nLengthCounter, nNewSampleLength - nLengthCounter);
+ nLengthCounter += soundtouch_receiveSamples(handleSt, reinterpret_cast<int16*>(pNewSample) + nChn * nLengthCounter, nNewSampleLength - nLengthCounter);
// Next buffer chunk
pos += len;
}
// The input sample should now be processed. Receive remaining samples.
- pSoundTouch->flush();
- while(pSoundTouch->numSamples() > 0 && nNewSampleLength > nLengthCounter)
+ soundtouch_flush(handleSt);
+ while(soundtouch_numSamples(handleSt) > 0 && nNewSampleLength > nLengthCounter)
{
- nLengthCounter += pSoundTouch->receiveSamples(reinterpret_cast<int16*>(pNewSample) + nChn * nLengthCounter, nNewSampleLength - nLengthCounter);
+ nLengthCounter += soundtouch_receiveSamples(handleSt, reinterpret_cast<int16*>(pNewSample) + nChn * nLengthCounter, nNewSampleLength - nLengthCounter);
}
- delete pSoundTouch; pSoundTouch = 0;
+ soundtouch_clear(handleSt);
+ ASSERT(soundtouch_isEmpty(handleSt) != 0);
ASSERT(nNewSampleLength >= nLengthCounter);
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2010-01-10 17:21:21 UTC (rev 462)
@@ -2724,7 +2724,7 @@
// case ID_NETLINK_UT: pszURL = "http://www.united-trackers.org"; break;
// case ID_NETLINK_OSMUSIC: pszURL = "http://www.osmusic.net/"; break;
// case ID_NETLINK_HANDBOOK: pszURL = "http://www.modplug.com/mods/handbook/handbook.htm"; break;
-// case ID_NETLINK_MPTFR: pszURL = "http://mpt.new.fr/"; break;
+ case ID_NETLINK_MPTFR: pszURL = "http://mpt.new.fr/"; break;
case ID_NETLINK_FORUMS: pszURL = "http://www.lpchip.com/modplug"; break;
case ID_NETLINK_PLUGINS: pszURL = "http://www.kvraudio.com"; break;
case ID_NETLINK_MODARCHIVE: pszURL = "http://modarchive.org/"; break;
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-10 17:21:21 UTC (rev 462)
@@ -227,24 +227,29 @@
static void ShowChangesDialog()
//-----------------------------
{
- /*
- const char* const firstOpenMessage = "OpenMPT development build " MPT_VERSION_STR ".\n\n"
- "Some notable changes since version 1.17.02.48:\n\n"
- " [New] Name filter in plugin selection dialog.\n"
- " [New] Behavior of vxx command when used with plugin instruments can now be configured in instrument tab.\n"
- " [New] MIDI controllers can be used to control plugin parameters(View->MIDI mapping).\n"
- " [New] Possibility to use more Impulse Tracker compatible playback with IT-files. Is used\n "
- " automatically if loaded IT-file doesn't seem to be Modplug made.\n"
- " [New/Fix] A couple of new sample editing functions and various modifications/fixes in sample tab.\n"
- " [Mod] mptm files made with this version will be recognized as IT in 1.17.02.48.\n"
- " [Mod] Automatic update check on startup is no longer available.\n"
- " [Fix] Copy/Paste in pattern was partly broken when working with MOD format.\n"
- " [Fix] Fixed wrong version in IT files saved with compatibility export.\n"
+ const char* const firstOpenMessage = "OpenMPT build " MPT_VERSION_STR ".\n\n"
+ "Some changes since version 1.17.02.54:\n\n"
+ " [New] Pattern tab: New paste modes: overflow, push forward and flood.\n"
+ " [Mod] Pattern tab: Keyboard split is now accessible from keyshortcut or menu.\n"
+ " [Imp] Pattern tab: Numerous improvements including better effect descriptions in note properties.\n"
+ " [New] Sequence editor: Can now handle order selections including delete/copy/cut/paste functionality.\n"
+ " [New] Sequence editor: Can render selected patterns to wave directly from orderlist.\n"
+ " [New] Envelope editor: Numerous improvements including ability to insert and remove points easily.\n"
+ " [New] Sample tab: sample undo, sample draw, resize sample, DC offset removal, batch export, better loop...\n"
+ " ...point handling when deleting selections. Play sample from given position with Ctrl + left mouse button.\n"
+ " [New] MPTM: New parameter controls for controlling plug params from pattern.\n"
+ " [New] MPTM: Can have envelope points up to 240 and multiple sequences.\n"
+ " [New] MIDI mapping: Editing a plug param in its editor while holding shift key will now open MIDI mapping dialog.\n"
+ " [New] MIDI mapping: Can now record MIDI mapping changes to pattern.\n"
+ " [Imp] MOD/S3M/XM/IT: Numerous improvements to load, save and playback compatibility.\n"
+ " [New] Input: Can import RIFF AM, RIFF AMFF, J2B, PSM16, IMF, GDM and SCL files. Improved PSM import.\n"
+ " [New] Setup: New default directories: plugins and plugin presets, sharable colour schemes\n"
+ " [New] Cleanup: New option compo cleanup, rearrange samples is back, can merge sequences.\n"
+ " [Mod] Misc: Program settings are now by default stored in %APPDATA%\\OpenMPT\n"
"\n"
- " For more detailed list of changes, see history.txt.";
+ " and many more. See history.txt for more details.";
CMainFrame::GetMainFrame()->MessageBox(firstOpenMessage, "OpenMPT " MPT_VERSION_STR, MB_ICONINFORMATION);
- */
}
@@ -1839,12 +1844,12 @@
const char* const pArrCredit = {
"OpenMPT / Modplug Tracker|"
- "Copyright \xA9 2004-2009 Contributors|"
+ "Copyright \xA9 2004-2010 Contributors|"
"Copyright \xA9 1997-2003 Olivier Lapicque (ol...@mo...)|"
"|"
"Contributors:|"
- "Ahti Lepp\xE4nen (2005-2009)|"
- "Johannes Schultz (2008-2009)|"
+ "Ahti Lepp\xE4nen (2005-2010)|"
+ "Johannes Schultz (2008-2010)|"
"Robin Fernandes (2004-2007)|"
"Sergiy Pylypenko (2007)|"
"Eric Chavanon (2004-2005)|"
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2010-01-10 17:21:21 UTC (rev 462)
@@ -2214,10 +2214,10 @@
break;
case PARAM_COLUMN:
case EFFECT_COLUMN:
- if(srcCmd.note == NOTE_PC || srcCmd.note == NOTE_PCS || destCmd.note == NOTE_PCS || destCmd.note == NOTE_PC)
+ if(srcCmd.IsPcNote() || destCmd.IsPcNote())
{
doPCinterpolation = true;
- PCnote = (srcCmd.note == NOTE_PC || srcCmd.note == NOTE_PCS) ? srcCmd.note : destCmd.note;
+ PCnote = (srcCmd.IsPcNote()) ? srcCmd.note : destCmd.note;
vsrc = srcCmd.GetValueEffectCol();
vdest = destCmd.GetValueEffectCol();
PCparam = srcCmd.GetValueVolCol();
@@ -2263,9 +2263,9 @@
case EFFECT_COLUMN:
if(doPCinterpolation)
{ // With PC/PCs notes, copy PCs note and plug index to all rows where
- // effect interpolation is done, if no PC note is there.
+ // effect interpolation is done if no PC note with non-zero instrument is there.
const uint16 val = static_cast<uint16>(vsrc + ((vdest - vsrc) * (int)i + verr) / distance);
- if(pcmd->note != NOTE_PC && pcmd->note != NOTE_PCS)
+ if (pcmd->IsPcNote() == false || pcmd->instr == 0)
{
pcmd->note = PCnote;
pcmd->instr = PCinst;
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2010-01-10 17:21:21 UTC (rev 462)
@@ -231,8 +231,8 @@
COMBOBOX IDC_COMBO2,78,18,73,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "Change Player Options",IDC_PLAYEROPTIONS,18,36,81,14,BS_CENTER
CONTROL "Channel mode (one file per channel)",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,168,8
- CONTROL "Normalize Output",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,73,10
- CONTROL "High quality resampling",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,102,66,84,10
+ CONTROL "Normalize Output (experimental)",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,119,10
+ CONTROL "High quality resampling",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,112,36,84,10
CONTROL "Slow render (for Kontakt+DFD)",IDC_GIVEPLUGSIDLETIME,
"Button",BS_AUTOCHECKBOX | BS_LEFT | BS_MULTILINE | WS_TABSTOP,18,78,133,8
GROUPBOX "Limit",IDC_STATIC,6,102,192,90
@@ -2308,6 +2308,7 @@
IDS_TUNING_IMPORT_SCL_FAILURE "-Unable to import ""%1%2"": %3.\n"
IDS_TUNING_IMPORT_UNRECOGNIZED_FILE
"-Unable to import file ""%1%2"": unrecognized file.\n"
+ IDS_SOUNDTOUCH_LOADFAILURE "Unable to load OpenMPT_soundtouch_i16.dll."
END
#endif // English (U.S.) resources
Modified: trunk/OpenMPT/mptrack/mptrack.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.vcproj 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/mptrack/mptrack.vcproj 2010-01-10 17:21:21 UTC (rev 462)
@@ -54,7 +54,7 @@
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch.dll"
+ DelayLoadDLLs="OpenMPT_soundtouch_i16.dll"
GenerateDebugInformation="TRUE"
AssemblyDebug="1"
ProgramDatabaseFile=".\Debug/mptrack.pdb"
@@ -132,7 +132,7 @@
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
- DelayLoadDLLs="OpenMPT_soundtouch.dll"
+ DelayLoadDLLs="OpenMPT_soundtouch_i16.dll"
GenerateDebugInformation="TRUE"
GenerateMapFile="FALSE"
MapFileName=".\Release/mptrack.map"
Modified: trunk/OpenMPT/mptrack/res/MPTRACK.RC2
===================================================================
--- trunk/OpenMPT/mptrack/res/MPTRACK.RC2 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/mptrack/res/MPTRACK.RC2 2010-01-10 17:21:21 UTC (rev 462)
@@ -43,7 +43,7 @@
VALUE "FileDescription", "OpenMPT / ModPlug Tracker"
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", "Modplug Tracker"
- VALUE "LegalCopyright", "Copyright \xA91997-2003 Olivier Lapicque; \xA92004-2009 contributors."
+ VALUE "LegalCopyright", "Copyright \xA91997-2003 Olivier Lapicque; \xA92004-2010 contributors."
VALUE "LegalTrademarks", "M.O.D.P.L.U.G"
VALUE "OriginalFilename", "mptrack.exe"
VALUE "PrivateBuild", ""
Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/mptrack/resource.h 2010-01-10 17:21:21 UTC (rev 462)
@@ -66,6 +66,7 @@
#define IDS_TUNING_IMPORT_UNKNOWN_TC_FAILURE 227
#define IDS_TUNING_IMPORT_SCL_FAILURE 228
#define IDS_TUNING_IMPORT_UNRECOGNIZED_FILE 229
+#define IDS_SOUNDTOUCH_LOADFAILURE 230
#define IDB_MAINBAR 300
#define IDB_IMAGELIST 301
#define IDB_PATTERNS 302
Modified: trunk/OpenMPT/packageTemplate/History.txt
===================================================================
--- trunk/OpenMPT/packageTemplate/History.txt 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/packageTemplate/History.txt 2010-01-10 17:21:21 UTC (rev 462)
@@ -3,12 +3,539 @@
.: bug fix
+: new feature
+^: Improvement
-: known issue / regression
/: change
?: other
(tx XYZ): thanks to XYZ for telling us about the bug
+--------------------
+
+General tab
+ . <Jojo> Channel name input field was not limited properly.
+
+Sequence editor
+ + <re> Can now copy/cut/paste order selections.
+ ^ <Jojo> Using the keyboard manager for shortcuts. 0...9, + and - keys are now also configurable.
+ ^ <Jojo> Duplicate / Create new pattern shortcuts do also work now here.
+ ^ <Jojo> Show cut/copy/paste orders in context menu.
+ ^ <Jojo> Middle click can now also be used for queuing patterns.
+ . <Jojo> Show correct shortcuts in context menus
+ . <Jojo> Pasting orders now removes "+++" items if they are not supported by the current format.
+ . <Jojo> Fixed display error when selecting multiple orders, inserting them and clicking on another order (only first order of previous selection was un-highlighted).
+
+Pattern tab::Pattern editing
+ + <Jojo> New paste mode "push forward paste", which resembles the default paste behaviour of Impulse Tracker. Includes new shortcut.
+ + <Jojo> The "paste flood" command pastes the clipboard content again and again until it hits the bottom of the pattern (overflow paste will be disabled automatically if paste flood is used, for obvious reasons).
+ ^ <Jojo> When using the MPTM format, plugin param changes are written to the pattern as PC Notes.
+ ^ <Jojo> Assume that the clipboard pattern format is IT (instead of MOD) if no information about the format is available.
+ ^ <Jojo> Pattern c&p: convert pasted commands if necessary.
+ / <re> Pattern c&p: Mix paste shouldn't anymore trigger conversion on modcommands that weren't changed at all. Now, however, partial conversion will not be done so this still needs further fixing.
+ ^ <Jojo> If "record note off" is enabled and Note Off commands are not supported by the current format, try Note Cut and volume commands.
+ / <Jojo> It is impossible to enter something into the volume column in mod format now.
+ / <Jojo> When interpolating PC notes, the plugin number and note type won't get overriden if the note type is already PC or PCs. I find this more logical.
+ . <re> Pattern c&p: Mix paste should behave better with parameter control notes.
+ . <Jojo> PCNote handling was missing in OnClearSelection, so it was possible to delete the effect column only partly
+ . <Jojo> Amplify acted VERY weird when it was applied on an instrument that's not assigned to any sample. Should be a bit better now.
+ . <Jojo> Amplify doesn't use volume column in mod format anymore.
+ . <Jojo> When recording live from the keyboard, SDx shouldn't exceed the song speed anymore.
+ . <Jojo> Got rid of possible redundant undo points.
+ . <Jojo> Pattern c&p: invalid commands are not pasted anymore.
+ . <Jojo> PC Notes are now deleted properly (last column).
+ . <Jojo> Copying only the param column of PC notes overwrote the value column when pasting them.
+ . <Jojo> Entering Note Fade notes didn't work the "old style" way.
+ . <Jojo> PCNote handling was missing in OnClearSelection, so it was possible to delete the effect column only partly.
+
+Pattern tab::GUI
+ + <Jojo> Channel rename dialog in channel header context menu.
+ ^ <Jojo> Tidied up the upper panel. It fits perfectly on a 1024x768 screen with treeview enabled and also works on 800x600 with treeview disabled. With the new layout, about 8 more pattern rows can be seen.
+ / <Jojo> Due to this cleanup, the "split keyboard" feature has been removed from the interface. The split keyboard settings dialog can now be accessed by using a shortcut, which should be even faster than the old method.
+ ^ <re> If keyboard split is active, instrument drop list will show split instrument and split note.
+ ^ <Jojo> Grey out pattern name input field when in MOD/S3M mode.
+ ^ <Jojo> Added sequence selection edit control.
+ / <Jojo> Instead of hiding the sequence name control, just disable it (looks better).
+ . <Jojo> If the current pattern is the last possible pattern in the sequence, no "next pattern" is displayed.
+
+Pattern tab::Note properties
+ ^ <Jojo> Hopefully correct limitation and explanation of "Set * waveform" parameters...
+ ^ <Jojo> Better explanation of "Invert Loop" parameter.
+
+Pattern tab::Find/replace
+ ^ <Jojo> When using Find&Replace, "follow song" will be disabled, because it's pointless and unusable with "follow song" on.
+ . <Jojo> Search&Replace didn't create an undo point.
+
+Pattern tab::Misc
+ + <Jojo> New keyboard shortcut in pattern context: Duplicate pattern.
+ . <Jojo> When in sample mode, samples were never stopped when in new-style note off mode, which lead to sample jam when using long/looped samples.
+
+Sample tab
+ + <Jojo> Sample Undo. 100 steps per sample (independent), undo buffer is cut off at a tenth of physical memory (that would be 400 MB for a system with 4 GB of RAM). Cutoff size can be specified by setting UndoBufferSize (in Megabytes) in section [Sample Editor] <Jojo> of mptrack.ini.
+ ^ <Jojo> When creating a new sample using "resize", sample loop is activated automatically.
+ ^ <Jojo> When sample is 8-bit, it will automatically be converted to 16-bit when applying time stretching / pitch shifting.
+ ^ <Jojo> Can now enter insanely high values into sample frequency input field (as they are supported by Impulse Tracker), allow only 65536 Hz for S3M files.
+ / <Jojo> Removed time stretcher's / pitch shifter's preview function as it's unnecessary now.
+ . <Jojo> When going down close to 0 Hz in the sample editor, the sample freq wrapped around to the maximum value.
+ . <Jojo> Insert Silence: Loop points were not updated when adding silence at the beginning of the sample
+ . <Jojo> Pitch shift: Was slightly broken for 8-bit samples.
+ . <Jojo> Time Stretch / Pitch Shift button's caption was not updated properly.
+
+Instrument tab
+ . <Jojo> When playing an instrument and disabling its envelopes at the same time, they're stopped (prevents filter envelope from turning into a pitch envelope).
+ . <re> Sample map was broken when dealing with sample indexes greater than 255.
+ . <Jojo> Update plugin list properly when cleaning up plugins while being on the instrument tab (possibly also improves instrument tab behaviour when working with multiple windows).
+
+Instrument tab::Envelope editor
+ + <Jojo> Envelopes can be edited using keyboard. Various keyboard shortcuts have been added to move and edit envelope points. This uses a common "drag and drop" node with mouse editing, so a point can first be clicked and the be moved with f.e. cursor keys.
+ ^ <Jojo> When creating a new envelope, automatically enable it as well.
+ ^ <Jojo> Mark currently selected envelope node yellow for better visibility.
+ / <Jojo> Middle line is also shown for volume envelope.
+ . <Jojo> When pasting envelopes, the enabled and filter flags were lost.
+
+Comments tab
+ ^ <Jojo> If sample size is < 1 KB, amount of bytes is shown instead of "0 KB".
+ . <Jojo> The lower part of the tab was receiving update messages that were not even meaningful to this tab (f.e. speed changes), so it was updating quite often modules that have alternating speed... Only letting in important update messages now.
+
+Treeview
+ + <Jojo> Show sequences in song treeview. Sequences can be inserted, duplicated and deleted by right-clicking the sequence items.
+ + <Jojo> Clicking on a mod item (only filename node) switches to the corresponding window.
+ + <Jojo> Display playing samples / instruments (only those that are assigned to a sample). Can be enabled from setup screen.
+ + <Jojo> Muted samples and instruments are shown with a different icon.
+ ^ <Jojo> Can now dragondrop orders, even between sequences.
+ ^ <Jojo> Double-clicking order items and pattern items should work now.
+ ^ <Jojo> Show whole sequence (don't stop on first "---" item).
+ ^ <Jojo> Switching between sequences should be easier now. There's a context menu entry for it and double-clicking on an empty sequence will switch to it (as there are no orderlist item to click on).
+ ^ <Jojo> Different icons for effects / instruments
+
+VST / MIDI mapping
+ ^ <Jojo> VST Editor: When dealing with midi learn in vst editors (with Shift key), also accept child windows of the VST editor as valid window. This still doesn't fix the Shift+clicking sliders issue in Synth1, but might help with other plugins.
+ ^ <Jojo> Further improvement to param mapping so that the midi dialog really only pops up when the VST window has the focus.
+ ^ <Jojo> VST Selector: Different icons for effects / instruments.
+ . <Jojo> When moving around plugins, param control notes are now also updated.
+ . <re> MIDI mapping: Pattern record checkbox wasn't updated properly.
+ . <re> MIDI mapping: Shift key erroneously opened MIDI mapping dialog in some cases.
+
+Mod conversion
+ ^ <Jojo> When converting a song that has subsongs to MPTM format, the user is asked if those subsongs should be converted into multiple sequences.
+ ^ <Jojo> Better conversion of MOD/XM E4x / E7x command.
+ ^ <Jojo> Better conversion of note off commands when converting to .mod.
+ ^ <Jojo> Removing channel features (pan/vol) in formats where they're not supported.
+ ^ <Jojo> Insert pattern break commands when resizing patterns to 64 rows that were smaller.
+ ^ <Jojo> Changing between MOD and XM format limits CMD_SPEED/CMD_TEMPO properly now.
+ ^ <Jojo> Trim sequence if it's too long.
+ ^ <Jojo> Detect and fix patterns with Bxx effect properly when merging sequences.
+ ^ <Jojo> If possible, all MPTM sequences will be merged into the first sequence.
+ ^ <Jojo> Remove sample vibrato and sustain loops for MOD/S3M.
+ ^ <Jojo> When converting to .MOD, order list won't be too long anymore.
+
+Playback (see also format-specific changes below)
+ ^ <Jojo> Added some more standard playback frequencies (176KHz, 192KHz).
+ . <Jojo> When jumping around in a module, high offset value is also memorized.
+
+IT::Saving
+ . <Jojo> Original IT specs concerning max orders/patterns were wrong. IT can handle up to 257 orders (as the last order is always ---, so it's actually 256 accessible orders), so the saving routines were also updated a bit.
+ . <Jojo> Save at least 2 order items.
+ . <Jojo> IT files with empty sample slots will now FINALLY save correctly in Impulse Tracker.
+ . <Jojo> Compatibility Export: Don't store "extended filter range" flag.
+
+IT::Loading
+ ^ <Jojo> Removed unnecessary / wrong pre-amp limits.
+ . <Jojo> IT files with global volume 0 are now loaded correctly.
+ . <Jojo> Use correct header size (1.xx or 2.xx header) for comparison when checking instrument headers.
+
+IT::Playback compatibility
+ . <Jojo> Reset NNA actions on every note (tentative fix).
+ . <Jojo> Fixes from SchismTracker: VolSwing, PanSwing, PPS.
+ . <Jojo> Out of range offset command with Old FX on.
+
+S3M
+ . <Jojo> ST3 compatibility: Only allow waveforms 0 to 3 for S3x / S4x / S5x.
+ . <Jojo> The S3M format actually knows muted channels. Added this to the S3M loader/saver and MuteChannel functions.
+
+XM::Loading
+ ^ <Jojo> Allow to load modules with an empty order list (as they are, in fact, valid XM files).
+
+XM::Playback compatibility
+ . <Jojo> A somewhat more compatible Rxy effect. Still needs more testing, as it's approximately the same algorithm as in Milky (which I know is not 100% correct).
+ . <Jojo> Almost perfect arpeggio emulation (only a few notes are still wrong).
+ . <Jojo> Rogue note delays.
+ . <Jojo> Perfect emulation of buggy Rxy behaviour. Thanks to Ian Luck for helping me with this.
+ . <Jojo> Slightly improved Rxy behaviour.
+ . <Jojo> Command X modplug extensions are now ignored in FT2 compat mode.
+
+MOD
+ ^ <Jojo> Mod Creation: Ensure that the order length fits the current mod specifications (this was problematic when creating .MOD files).
+ . <Jojo> Mod Creation: MOD Panning scheme is set up correctly now.
+ . <Jojo> MOD Loader: 8Chn Startrekker modules ("FLT8") are loaded correctly now.
+
+MOD::Playback compatibility
+ + <Jojo> Added song flag "PT 1.x Mode" (for .MOD files) that enabled on-the-fly sample swapping as ProTracker did it.
+ + <Jojo> Support for the EFx command (Invert Loop). One has to pay attention when working with this command as it effictively trashes samples.
+ ^ <Jojo> MOD Playback: if PT1.x playback flag is set, 8xx and E8x panning commands are now ignored.
+ ^ <Jojo> MOD Playing: Some more (minor) tweaks for Invert Loop. Thanks again, bubsy!.
+ . <Jojo> Further fixes to "Invert Loop" command (thanks, bubsy).
+ . <Jojo> Improvements to the "Invert Loop" effect (was only applied on rows with EFx).
+
+Module cleanup
+ + <Jojo> New cleanup feature: Merge sequences.
+ ^ <Jojo> Pattern Cleanup does now also work with multiple sequences.
+ ^ <Jojo> Improved cleanup dialog, with new options (remove all *, optimize samples).
+
+MP3/Wav export
+ + <Jojo> Wave Convert: Normalization is back as experimental feature.
+ + <Jojo> Wav/Mp3 export: Show estimated remaining time.
+ ^ <Jojo> Mp3 export: Removed 60 minutes limit.
+ . <Jojo> Mp3 export: use uint64 like in wav export (instead of uint32), to prevent wraparounds with very long modules like Skaven's "Beyond the Network".
+ . <Jojo> Wave Convert: The wave convert dialog had two default buttons, one of them (the "default default button") didn't make sense.
+
+Colour setup
+ + <Jojo> Channel separators can now have custom colors.
+ + <Jojo> Can now specify the blend colour for prev/next patterns.
+ / <Jojo> Changed FT2 and IT presets to resemble those two trackers as much as possible.
+ / <Jojo> Added VU Meter colours for the pattern colour presets.
+ / <Jojo> Changed the "Buzz" colour scheme a bit.
+ . <Jojo> When loading colour presets that have less colours are defined than required, the missing colours will be replaced by those from the "MPT" preset.
+ . <Jojo> When no INI file was present, channel separators were completely black.
+
+Keymaps
+ + <Jojo> Two new keymaps: French Laptop by Paul Legovitch, Norwegian MPT Classic by Rakib.
+ ^ <Jojo> When loading a keymap file and unrecognized lines are found, only one messagebox is shown.
+ / <Jojo> All keymaps have been updated to version 1 and updated to contain the orderlist shortcuts.
+ . <Jojo> Keymap files have a version number now (currently version 1). If keymap file doesn't have a version number (that's version 0), the orderlist keys will be added automatically so that orderlist remains usable in new builds.
+
+Tuning
+ + <re> Can import scl-files. Upper limit for note count is 64.
+ ^ <Jojo> Tuning dialog: Using the default tuning path as default path for Import/Export dialog
+
+Module format support
+ + <Jojo> Can now import RIFF AM and RIFF AMFF files, as well as J2B files, which are compressed AM(FF) files. Added zlib 1.2.3 for J2B support.
+ + <Jojo> Can now import PSM16 files.
+ . <Jojo> MED Loader: Possible error when loading orderlist.
+ . <Jojo> PSM16 Loader: It was possible to load corrupted modules with > MAX_BASECHANNELS channels (up to 0xFFFF).
+ . <Jojo> MDL Loader: Various fixes (taken from Schism Tracker).
+ . <Jojo> IMF Loader: Slightly wrong instrument loader (this for once didn't break anything, though).
+ . <Jojo> AMF Loader: Missing break command.
+
+Misc
+ ^ <Jojo> All Loaders: Using a new template, SpaceToNullStringFixed, which filters out all null chars in song/sample/instrument/etc. names. This avoids "empty" instrument names that occured in a couple of .IT files before.
+ ^ <Jojo> Mainframe: Extended paste mechanisms (mix, flood, push forward) have been moved into a sub menu.
+ ^ <Jojo> Mainframe: Improved accelerator keys in the edit menu.
+ ^ <Jojo> Added "split keyboard settings" dialog to the "edit" menu and updated the shortcuts there (goto was missing).
+ ^ <re> SoundTouch: Update to version 1.5.0.
+ / <Jojo> Store configuration and tuning files in %APPDATA% if possible. Can be disabled by adding UseAppDataDirectory=0 to [Paths] in mptrack.ini.
+ / <Jojo> Mod Creation: When clicking on the "new" button, the newly created module will be of the same type as the currently active document. Should probably be an option.
+ / <Jojo> Made Graph and Pattern Randomizer shortcuts invisible.
+ / <Jojo> Compatibility Export: Use module working directory in "save as" dialog.
+ / <Jojo> Using MS Shell Dlg font instead of MS Sans Serif in resource file.
+ / <re> Changed some "modplug tracker" strings to "OpenMPT".
+ . <Jojo> When using a Load/Save dialog, MPT's key handler will be disabled so that common shortcuts like F2, Ctrl+C, Ctrl+V, Esc. etc. can still be used.
+ . <Jojo> Mod Loaders: Very short sample sustain loops are now also accepted (similar fix to normal loop points).
+ . <Jojo> Mod Creation: Filling the whole mod title field with null bytes on creation to avoid funky characters in other programs.
+ . <Jojo> When moving program files to %APPDATA%, take care of the keyboard settings path in the INI file.
+ . <Jojo> Increased "filename" string in instrument header field to 32, since CHAR[12] is not really enough for 12 letters...
+ . <re> Autosave: 'Modified since last autosave'-flag wasn't updated when document was set modified using ThreadSafeSetModified.
+ . <re> Fixes to handling of 32 chars long instrument name.
+
+
+v1.17.03.02 (test build) (September 2009, revision 371)
+-------------------------------------------------------
+
+General tab
+ ^ <Jojo> "Modtype" dialog will revert mod flags to previous values if user presses the Cancel button.
+ ^ <Jojo> Modtype Dialog: Added suffixes IT and S3M to some mod flags for more clarity.
+ . <Jojo> VSTi / Sample volume sliders only go up to 255 instead of 256.
+ . <Jojo> Document will now be set modified when moving or inserting plugins.
+
+Sequence editor
+ + <Jojo> Multiple orders can be selected in the pattern sequence. At the moment, it is possible to insert, delete, duplicate and dragondrop multiple orders.
+ + <Jojo> Added context menu item "Render to wave", to render one or more patterns to wave.
+
+Pattern tab
+ + <Jojo> Paste will now optionally continue on next pattern (overflow paste).
+ + <re> Channel reset(stops note, sets initial chn settings). Available from channel header context menu and new key binding.
+ + <Jojo> When shift-clicking somewhere, a selection will be drawn from the previous cursor position to the new position.
+ ^ <Jojo> Showing descriptions of "special" notes in the statusbar, like it's done for effects.
+ ^ <Jojo> Shrinking patterns is now also possible with patterns < 32 rows.
+ ^ <Jojo> Solo/Unmute context menu has a bit more dynamical transition menu points (experimental).
+ ^ <re> Added some checks to prevent entering notes which are not supported by the module type.
+ / <Jojo> Entering note with row spacing enabled can now move cursor to next pattern if continuous scroll is enabled.
+ . <Jojo> Inserting a new pattern won't resize it to 32 rows anymore if the current pattern has less than 32 rows.
+ . <Jojo> Show "offset" and "velocity" volume commands in default color instead of "pitch" color.
+ . <Jojo> Weird combination of context menu shortcut and "always center active row" being disabled (http://lpchip.com/modplug/viewtopic.php?t=3203).
+ . <Jojo> Keyboard split note was off by one.
+ . <Jojo> Set max. row spacing / skipping value to 64, visibly clamp values > 64 to 64 in the edit box.
+
+Pattern tab::Note properties
+ ^ <Jojo> Added description to high offset command in note properties dialog.
+ ^ <Jojo> 8-Bit Panning slider also has the "Surround" state in S3M format now.
+ ^ <Jojo> Proper display of Pxy effect in the note editor window.
+ ^ <Jojo> Explanation for Tremor effect.
+ ^ <Jojo> Completed descriptions for extended MOD/XM, fixed display of several effects.
+ ^ <Jojo> Added description for S1x - Glissando Control.
+ . <Jojo> When double-clicking on a note in the pattern editor, the noteMin offset was not taken into consideration, which lead to wrong information for some formats.
+
+Pattern tab::Find/replace
+ ^ <Jojo> Don't reset "replace all" flag after every search.
+ / <Jojo> "Search in whole song" and "Replace all" are now enabled by default.
+ . <Jojo> Works now also with high instrument numbers. Also, empty instrument numbers won't be affected by "ins+1" anymore.
+ . <Jojo> Notes that cannot be used in the given format are not shown in the dropdown combo.
+ . <Jojo> Made comboboxes more convenient to use.
+
+Pattern tab::Macro config
+ ^ <Jojo> Also show the current preset for Zxx config (Z80 - ZFF).
+ . <Jojo> "Show All" FX display starts at 1 instead of 0, like all other FX enumerations.
+
+Sample tab
+ + <coda> Sample drawing.
+ + <coda> Add silence to sample.
+ + <Jojo> Can now play sample from given position with Ctrl + left mouse button.
+ + <Jojo> DC offset removal.
+ + <Jojo> Batch export samples (shift + click on "save sample" icon).
+ + <Jojo> Added setting "FinetuneStep" to INI section "Sample Editor".
+ ^ <Jojo> It is now possible to resize samples to a given sample size. You can do this using the already existing "add silence" dialog.
+ ^ <Jojo> Better loop point handling when deleting sample selections.
+ . <Jojo> Limit sample vibrato fields properly. Vibrato Sweep ranges from 0 to 255 now.
+ . <Jojo> Remove special chars from sample filenames so the "save as" dialog will show up on OSs < Vista.
+ . <Jojo> When using the spin control, frequency is not clamped to [2000, 96000] anymore.
+ . <Jojo> Removed tuning from up/downsampling for MOD files which detuned them when saving.
+ . <Jojo> Global volume is now also being adjusted for stereo and 16-Bit samples.
+ . <Jojo> Transpose is now disabled when using MOD format.
+
+Instrument tab
+ + <Jojo> Envelope points can now be added by shift-clicking somewhere in the envelope editor. Middle mouse button click removes the nearest point.
+ ^ <Jojo> Sample map shows tuning-specific notename on context menu.
+ ^ <Jojo> Added "Map all notes to <note name>" to instrument mapping context menu.
+ / <Jojo> Also show values from 0 to 64 for filter envelope (instead of -32 to 32).
+ . <Jojo> Pitch/Pan input field allows negative values.
+ . <Jojo> Proper limits for IT/XM fadeout values.
+ . <Jojo> Playing correct note in the instrument mapping control (notable difference when editing the scale from bottom to top).
+ . <Jojo> No relative values are shown for envelopes with no release node (status bar).
+ . <Jojo> Remove special chars from sample filenames so the "save as" dialog will show up on OSs < Vista.
+ . <Jojo> Fixed crash in instrument view that occured if RowsPerBeat was 0.
+ . <re> Fix to crash that occurred when multiple windows had instrument tab of the same document open.
+
+Comments tab
+ ^ <Jojo> Default view mode is instruments instead of samples for XM files.
+ ^ <Jojo> Instrument / Sample list: Double click will switch to instrument / sample.
+
+Treeview
+ . <Jojo> Playing sounds from a soundfont was broken.
+ . <Jojo> Deleting patterns from a module will also reset their names.
+
+VST / MIDI mapping
+ + <re> Editing a plug param in its editor while holding shift key will now open MIDI mapping dialog.
+ + <re> Can now record MIDI mapping changes to pattern.
+ / <re> Changed host IDs and a couple of related return values. If compatibility problems occur, old IDs can be set with ini-settings.
+ . <Jojo> Some minor tweaks and fixes to the MIDI mapping dialog.
+
+Mod conversion
+ ^ <Jojo> Convert E9x to Q8x as Q0x actually means "continue" and note "no change" for the volume change.
+ ^ <Jojo> Even better conversion of various pattern effects, including 8-Bit Panning, Arpeggio (XM swaps the two parameters) including Surround, Note Cut/Off/Fade conversion, MOD retrigger, XM->IT volume column limitations, illegal notes).
+ ^ <Jojo> Proper conversion of Pxy effect.
+ ^ <Jojo> Full volume column conversion, resetting default global volume / tempo / speed for MOD files.
+ ^ <Jojo> \xx is converted to Zxx when converting to / saving S3M files or "compatible" IT files.
+ ^ <Jojo> Somewhat decent conversion of Kxx (Key Off) from XM to S3M/IT.
+ ^ <Jojo> Trim instrument envelopes if they're too long for the new format.
+ ^ <Jojo> Convert 500/600 commands properly from MOD to any format, Adjust sustain loops for XM files, removed XM arpeggio conversion (it might be unwanted).
+ ^ <Jojo> Try to use fix commands that don't have cache (00 value) in XM (Arpeggio) and MOD format (Arpeggio and a few others) by using the previous value.
+ . <Jojo> Proper conversion between IT 8-Bit panning effect and S3M 7-Bit panning effect with surround.
+ . <Jojo> Unset release nodes were corrupted when converting modules.
+
+Playback (see also format-specific changes below)
+ ^ <Jojo> Mixing: It's now possible to go down to 1ms latency (works with ASIO).
+ ^ <Jojo> If restart position is 0 and a subtune is played (i.e. a tune separated with a "---" pattern), OpenMPT will now try to jump back to the first order of this subtune instead.
+ ^ <Jojo> Added option to not reset all channels and variables when looping a module.
+ . <Jojo> 4-Bit panning didn't disable surround sound (fixed in compatibility mode in IT/MPTM/XM).
+ . <Jojo> Process pattern break commands on last pattern properly.
+
+MPTM
+ + <re> New experimental parameter controls for controlling plug params.
+ + <re> Can now have multiple sequences in a module (access from orderlist context menu).
+ + <Jojo> Allow up to 240 envelope points.
+ + <Jojo> IT "Note Fade" command: This existed in IT's player routines already, but there was no way to actually use it in the editor. Triggering an invalid note would cause a note fade, so this is a new note type.
+ + <re> Channel settings(vol&pan) for channels after 64 will now be saved in the file.
+
+IT
+ + <Jojo> IT "Note Fade" command: This existed in IT's player routines already, but there was no way to actually use it in the editor. Triggering an invalid note would cause a note fade, so this is a new note type.
+ + <re> Channel settings(vol&pan) for channels after 64 will now be saved in the file.
+
+IT::Saving
+ ^ <Jojo> Compatibility Export: Save with custom "tracker version" header field (same as for S3M).
+ ^ <Jojo> Compatibility Export: Removed stereo sample support.
+ ^ <Jojo> Use row highlighting places in IT header.
+ . <Jojo> Compatibility Export: Ignore new MPT effects.
+ . <Jojo> Compatibility Export: doesn't screw up patterns anymore if the module has more than 64 channels.
+ . <Jojo> Compatibility Export: Changes various version numbers and settings in compatibility export to better match Impulse Tracker made IT files.
+ . <Jojo> Limit fadeout values properly.
+
+IT::Loading
+ ^ <Jojo> Can now load IT files with very small patterns (< 4 rows).
+ ^ <Jojo> Setting the "last saved with" version to 1.16 (instead of "created with") if module seems to be made with the old MPT.
+ ^ <Jojo> Reading our custom tracker version now as well.
+ ^ <Jojo> Detect more version of MPT that did stupid things.
+ ^ <Jojo> Row highlighting in IT header is now recognized.
+ . <Jojo> Unset release env nodes for IT files made with IT 1.x, fix fadeout values.
+ . <Jojo> Don't set "made with modplug" flag for IT files that were made with compatibility export.
+ . <Jojo> Proper adjustment of sample pre-amp.
+ . <Jojo> It is now possible to load IT files that have no samples.
+ . <Jojo> 31 BPM is an allowed default tempo. Tentative fix: Clamp to 32 (instead of 125).
+ . <Jojo> OpenMPT was loading the volume column command hx (vibrato depth) as ux (vibrato speed) and also saving it like this. In the pattern editor, ux was allowed, hx was not but it should be the other way around. Now, hx is always used but ux is still loaded correctly for old modules made with MPT/OpenMPT.
+
+IT::Playback compatibility
+ ^ <Jojo> More improvements to Vibrato, Tremolo and Panbrello. Using the tables from IT_TECH.TXT.
+ ^ <Jojo> Improved IT compatible retrigger (didn't work if the retrigger didn't start together with a new note).
+ . <Jojo> Better sample vibrato compatibility. Vibrato Sweep isn't perfect yet, though.
+ . <Jojo> Special case of Retrigger + Envelopes.
+ . <Jojo> Offset beyond sample range.
+ . <Jojo> Removed a "fix" again that was causing to completely destroy panbrello.
+ . <Jojo> Don't reset channel panning if panbrello ends (experimental).
+ . <Jojo> Don't reset Tremolo on new note, don't ignore tremolo if note volume is 0.
+ . <Jojo> Fixed Tremolo, Vibrato and Panbrello tables.
+ . <Jojo> Ignore S [345]x with x > 3.
+ . <Jojo> Multisample instruments change with no entry in the instrument column (fixes spx-shuttledeparture.it) (test me).
+ . <Jojo> Tremor also works properly with "old effects" on.
+ . <Jojo> Fixed retrigger for Qxx when not being triggered together with a note.
+ . <Jojo> Pattern loop count won't be reset on pattern transition (fixes gm-trippy01.it).
+ . <Jojo> Tempo slides won't exceed 255 BPM in compatible mode.
+ . <Jojo> Allow OpenMPT's new volume colum commands (offset etc.) to be used together with Retrigger in compatible mode again.
+ . <Jojo> Random waveforms (vibrato, tremolo, panbrello) (test #19).
+ . <Jojo> Fixed handling of very short pitch / filter envelopes (test #24).
+ . <Jojo> Panning fx (Xxx, S8x, pxx) override pan swing (test #20).
+ . <Jojo> Improved retrigger compatibility even more (#15)
+ . <Jojo> SD0 / SC0 is now interpreted as SD1 / SC1 in compatibility mode (test #22).
+ . <Jojo> Portamento up / down resets the destination of tone portamento (test #23).
+ . <Jojo> Tremor: Sounds like in IT when compatible playback mode is turned on.
+ . <Jojo> Out of range global volume, local global volume slides.
+ . <Jojo> Retrigger effect behaved slightly wrong.
+
+S3M::Saving
+ ^ <Jojo> Orderlist is now as small as possible (multiple of 2 instead of multiple of 16); Using ST3's default UltraClick value.
+ ^ <Jojo> Using an own version number in the header now, just like all the other trackers.
+ ^ <Jojo> Don't write unnecessary invalid order items in the order table.
+ . <Jojo> Set the stereo flag.
+ . <Jojo> Ignore new MPT effects.
+ . <Jojo> Patterns are now saved correctly. Previously, the last few rows might have come up as garbage in ST3, especially (only?) when they were empty.
+ . <Jojo> Clamp sample pre-amp to [32;127] instead of just taking the lower 7 bits. (Default pre-amp value as 128, which resulted in pre-amp 0 when saving).
+
+S3M::Loading
+ ^ <Jojo> Recognize OpenMPT version in S3M header.
+ . <Jojo> Limit min sample preamp value to 0x10.
+ . <Jojo> Small modifications to pattern loader to load somewhat broken S3M files.
+ . <Jojo> Don't reset global volume to max if it is min for "new" modules.
+ . <Jojo> Smarter Zxx conversion.
+ . <Jojo> Disable loop for files with very short loop at the beginning of the sample.
+ . <Jojo> Samples with very short loops (2 bytes) will now load correctly. This fixes for example 94hitmix.s3m and spectral.s3m.
+ . <Jojo> Short loops in S3M samples are now recognized.
+
+S3M::Misc
+ . <Jojo> Module Creation / Loading: Sane default volume settings for MOD / S3M files again(128 global volume, 48 sample volume)
+ . <Jojo> S3M compatibility: Notes with SD0 are now ignored, SC0 is completely ignored
+
+XM
+ + <Jojo> Compatibility Export.
+ + <Jojo> Compatibility play-mode.
+
+XM::Loading
+ + <Jojo> Detects compatibility mode automatically when loading XM-file.
+ ^ <Jojo> Detect non-mpt modules more reliably.
+ ^ <Jojo> Advanced "made with MPT" detection.
+ ^ <Jojo> Detect a very old MPT version.
+ ^ <Jojo> Make XMs with strange pattern header sizes load correctly (removed some code that was there to make really, really broken XMs load - would this work at all?).
+ ^ <Jojo> Setting the "last saved with" version to 1.16 (instead of "created with") if module seems to be made with the old MPT.
+ ^ <Jojo> Less hacky implementation of the instrument loader. Still works correctly with "normal" XM modules and BoobieSqueezed XMs.
+ . <Jojo> Various changes to make XMs that have been compressed with BoobieSqueezer load correctly. Should not break anything, but I call it "experimental".
+ . <Jojo> Can now load XM Version 1.02 and 1.03.
+ . <Jojo> More intelligent conversion of Speed / Tempo commands.
+ . <Jojo> Don't ignore last pattern if XM has no instruments.
+
+XM::Saving
+ ^ <Jojo> Compatibility export: Export cuts off channels > 32.
+ ^ <Jojo> Setting "Open ModPlug Tracker" in the "made with" field (as any other tracker put their signature in here as well).
+ ^ <Jojo> Include version number in "made with" string.
+ ^ <Jojo> When channel count is odd, the empty channel is now always the last one.
+ . <Jojo> Always save with a channel number that's a multiple of two so FT2 will load the file correctly.
+ . <Jojo> F20 won't turn into G20.
+ . <Jojo> Limit fadeout values properly.
+ . <Jojo> More intelligent conversion of Speed / Tempo commands.
+
+XM::Playback compatibility
+ . <Jojo> Portamento + New Note with no previous note (tentative fix), Offset beyond sample range.
+ . <Jojo> Compatible Arpeggio was done wrong.
+ . <Jojo> More compatible "Note Off + Something".
+ . <Jojo> Note Off with instrument number causes fadeout for samples that have no envelope.
+ . <Jojo> Volume command Ux should not enable Vibrato at all, it only sets the vibrato speed.
+ . <Jojo> Pxy effect was too deep.
+ . <Jojo> Using MilkyTracker's arpeggio logic for better XM arpeggio compatibility - still not perfect!
+ . <Jojo> Tempo slides won't exceed 255 BPM in compatible mode.
+ . <Jojo> In compatible mode, old retrigger routines are used again (as MPT's default retrigger algorithm actually represents FT2's retrigger algorithm). Additionally, a retrigger bug from FT2 is emulated (retrigger with vxx on the same channel would always reset the retriggered note's volume).
+ . <Jojo> More compatible handling of Kxx effect.
+ . <Jojo> Pattern loops are now handeled correctly in XM (using compatibility switch) and MOD files.
+ . <Jojo> Out of range global volume, local global volume slides.
+ . <Jojo> Arpeggio was played wrong (0xy should play base note - y - x, not base note - x - y).
+
+MOD
+ ^ <Jojo> Module Creation: MOD files have 4 channels by default.
+ ^ <Jojo> Moved loop length check from compatibility export to normal save, as it does not break/change any MPT-made MOD file.
+ . <Jojo> Module Creation / Loading: Sane default volume settings for MOD / S3M files again(128 global volume, 48 sample volume).
+ . <Jojo> Inserting more than 128 orders in MOD format is not possible anymore.
+
+MOD::Loading
+ . <Jojo> More intelligent conversion of Speed / Tempo commands.
+ . <Jojo> Last pattern was not loading in .MODs that have no samples.
+
+MOD::Saving
+ . <Jojo> The compatibility export was only working properly for 8-bit mono samples. Everything else is going to be downsampled later, so the sample "fixing" has to be done before.
+ . <Jojo> More intelligent conversion of Speed / Tempo commands.
+ . <Jojo> F20 won't turn into G20.
+
+MOD::Playback compatibility
+ . <Jojo> 8-Bit Panning is not 7-Bit panning (using 800...8FF instead of 800...880 - fixes f.e. DOPE.MOD).
+ . <Jojo> Pattern loops are now handeled correctly in XM (using compatibility switch) and MOD files.
+
+Setup
+ + <Jojo> New default directories: plugins and plugin presets.
+ + <Jojo> Option reset ramping and resampling to default values.
+ + <Jojo> Shareable color schemes (via config dialog).
+ ^ <Jojo> Added note to "always center active row" hint that this is required to be enabled for greyed out patterns.
+ ^ <Jojo> Slight redesign of the WAV / MP3 export dialogs.
+ / <Jojo> Changes to default general options configuration.
+
+Module format support
+ + <Jojo> Can now import IMF (Imago Orpheus) modules.
+ + <Jojo> Can now import GDM files.
+ . <Jojo> A brand new PSM loader! Ditched the old and buggy loader as the new loader works way better, it can even handle modules from Extreme Pinball.
+ . <Jojo> 669 Loader: Small modification so corehop.669 can be loaded; Note: Loader is still buggy like hell
+
+Misc
+ + <Jojo> Compo cleanup.
+ + <Jojo> Rearrange samples is back! And this time, it's even fully functional!.
+ ^ <Jojo> XI Saver: Fill out the "created with" field properly (OpenMPT instead of FastTracker 2).
+ ^ <Jojo> Write ID3v2.4 instead of ID3v1 tags. Includes various changes to length limits, genre limitations and what's written in the tags.
+ ^ <Jojo> Mod Specs: Decreased minimum pattern size for XM and IT format to 1 row. Experimental, but should not break anything (needs more testing).
+ ^ <Jojo> Mod Specs: It is now possible to have modules with 1-3 channels, as this only seems to cause trouble with MOD files (so they still have 4 channels minimum of course).
+ ^ <Jojo> Autosave: If a module has not been changed since the last autosave, it will not be autosaved.
+ ^ <Jojo> Module loader: If plugins are missing, a single MessageBox is shown.
+ ^ <kode54> LHA Decoder: Several fixes (patch by kode54).
+ / <re> Default keybings are now included in the executable -> default keybindings are available even without external keybinding file.
+ . <Jojo> Menus: Added the correct shortcut keys again and replaced the last(?) remaining "Midi" labels by "MIDI".
+ . <Jojo> Wav Export / Channel Manager / Pattern Editor: Pattern names with leading space char are now accepted.
+ . <Jojo> General tab / Main bar / Loaders / Conversion: Fixed arbitrary speed limits (64 on general tab, 127 on main bar).
+ . <Jojo> Keyboard manager: Octave offset for key descriptions is now C, not A.
+ . <Jojo> Patterns: Reset pattern name when deleting pattern.
+
+Internal
+ ? There are now project files for Visual Studio 2008.
+ ? Notable refactoring including renaming of MODINSTRUMENT to MODSAMPLE and INSTRUMENTHEADER to MODINSTRUMENT.
+
+
+v1.17.02.54 (June 2009, revision 274)
+-------------------------------------
+
+ . <re> Pattern tab: It's now possible to use the old note fade behaviour when playing notes (see setup->general). (rev. 267)
+ . <re> Pattern tab: Fixed wrong interpretations of "Old style pattern context menu"-option. (rev. 267)
+ . <re> Misc: Some internal fixes. (rev. 267)
+
+
v1.17.02.53 (May 2009, revision 259)
------------------------------------
Modified: trunk/OpenMPT/soundlib/modsmp_ctrl.cpp
===================================================================
--- trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/soundlib/modsmp_ctrl.cpp 2010-01-10 17:21:21 UTC (rev 462)
@@ -496,10 +496,12 @@
if (Chn[i].pSample == pOldSample)
{
Chn[i].pSample = pNewSample;
- Chn[i].pCurrentSample = pNewSample;
+ if (Chn[i].pCurrentSample != nullptr)
+ Chn[i].pCurrentSample = pNewSample;
if (Chn[i].nPos > nNewLength)
Chn[i].nPos = 0;
- Chn[i].nLength = nNewLength;
+ if (Chn[i].nLength > 0)
+ Chn[i].nLength = nNewLength;
Chn[i].dwFlags |= orFlags;
Chn[i].dwFlags &= andFlags;
}
Modified: trunk/OpenMPT/soundtouch/FIFOSamplePipe.h
===================================================================
--- trunk/OpenMPT/soundtouch/FIFOSamplePipe.h 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/soundtouch/FIFOSamplePipe.h 2010-01-10 17:21:21 UTC (rev 462)
@@ -1,12 +1,3 @@
-/***********************************************
- *
- * ------------- NOTE -------------
- *
- * This file is modified version of the original SoundTouch file.
- * Search for "OpenMPT_change" to see the modifications.
- *
-*/
-
////////////////////////////////////////////////////////////////////////////////
///
/// 'FIFOSamplePipe' : An abstract base class for classes that manipulate sound
@@ -26,7 +17,11 @@
///
////////////////////////////////////////////////////////////////////////////////
//
+// Last changed : $Date: 2009-04-13 16:18:48 +0300 (Mon, 13 Apr 2009) $
+// File revision : $Revision: 4 $
//
+// $Id: FIFOSamplePipe.h 69 2009-04-13 13:18:48Z oparviai $
+//
////////////////////////////////////////////////////////////////////////////////
//
// License :
@@ -61,8 +56,7 @@
{
/// Abstract base class for FIFO (first-in-first-out) sample processing classes.
-// OpenMPT_change: Added SOUNDTOUCH_DLLEXPORT.
-class SOUNDTOUCH_DLLEXPORT FIFOSamplePipe
+class FIFOSamplePipe
{
public:
// virtual default destructor
@@ -132,8 +126,7 @@
/// When samples are input to this class, they're first processed and then put to
/// the FIFO pipe that's defined as output of this class. This output pipe can be
/// either other processing stage or a FIFO sample buffer.
-// OpenMPT_change: Added SOUNDTOUCH_DLLEXPORT.
-class SOUNDTOUCH_DLLEXPORT FIFOProcessor :public FIFOSamplePipe
+class FIFOProcessor :public FIFOSamplePipe
{
protected:
/// Internal pipe where processed samples are put.
Modified: trunk/OpenMPT/soundtouch/STTypes.h
===================================================================
--- trunk/OpenMPT/soundtouch/STTypes.h 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/soundtouch/STTypes.h 2010-01-10 17:21:21 UTC (rev 462)
@@ -1,12 +1,3 @@
-/***********************************************
- *
- * ------------- NOTE -------------
- *
- * This file is modified version of the original SoundTouch file.
- * Search for "OpenMPT_change" to see the modifications.
- *
-*/
-
////////////////////////////////////////////////////////////////////////////////
///
/// Common type definitions for SoundTouch audio processing library.
@@ -17,6 +8,11 @@
///
////////////////////////////////////////////////////////////////////////////////
//
+// Last changed : $Date: 2009-05-17 14:30:57 +0300 (Sun, 17 May 2009) $
+// File revision : $Revision: 3 $
+//
+// $Id: STTypes.h 70 2009-05-17 11:30:57Z oparviai $
+//
////////////////////////////////////////////////////////////////////////////////
//
// License :
@@ -46,16 +42,6 @@
typedef unsigned int uint;
typedef unsigned long ulong;
-// OpenMPT_change-->: Added SOUNDTOUCH_DLLEXPORT definition, Defined INTEGER_SAMPLES definition.
-#ifdef SOUNDTOUCH_EXPORTS
- #define SOUNDTOUCH_DLLEXPORT __declspec(dllexport)
-#else
- #define SOUNDTOUCH_DLLEXPORT __declspec(dllimport)
-#endif
-
-#define INTEGER_SAMPLES 1
-// <-- OpenMPT_change
-
#ifdef __GNUC__
// In GCC, include soundtouch_config.h made by config scritps
#include "soundtouch_config.h"
Modified: trunk/OpenMPT/soundtouch/SoundTouch.h
===================================================================
--- trunk/OpenMPT/soundtouch/SoundTouch.h 2010-01-10 14:50:33 UTC (rev 461)
+++ trunk/OpenMPT/soundtouch/SoundTouch.h 2010-01-...
[truncated message content] |
|
From: <sag...@us...> - 2010-01-10 14:50:43
|
Revision: 461
http://modplug.svn.sourceforge.net/modplug/?rev=461&view=rev
Author: saga-games
Date: 2010-01-10 14:50:33 +0000 (Sun, 10 Jan 2010)
Log Message:
-----------
[Mod] Reverted the "IT" and "FT2" colour schemes to what they used to be until 1.17.02.54, since those colour schemes worked better. However, since they do not resemble IT or FT2 in any way, they have been simply renamed to "Green" and "Blue".
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Moptions.cpp
trunk/OpenMPT/mptrack/mptrack.rc
Modified: trunk/OpenMPT/mptrack/Moptions.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moptions.cpp 2010-01-09 20:06:18 UTC (rev 460)
+++ trunk/OpenMPT/mptrack/Moptions.cpp 2010-01-10 14:50:33 UTC (rev 461)
@@ -422,30 +422,31 @@
void COptionsColors::OnPresetFT2()
//--------------------------------
{
+ // "blue"
CustomColors[MODCOLOR_BACKNORMAL] = RGB(0x00, 0x00, 0x00);
- CustomColors[MODCOLOR_TEXTNORMAL] = RGB(0xFF, 0xFF, 0x82);
- CustomColors[MODCOLOR_BACKCURROW] = RGB(0x49, 0x75, 0x82);
- CustomColors[MODCOLOR_TEXTCURROW] = RGB(0xFF, 0xFF, 0x5F);
- CustomColors[MODCOLOR_BACKSELECTED] = RGB(0x28, 0x28, 0x28);
+ CustomColors[MODCOLOR_TEXTNORMAL] = RGB(0xE0, 0xE0, 0x40);
+ CustomColors[MODCOLOR_BACKCURROW] = RGB(0x70, 0x70, 0x70);
+ CustomColors[MODCOLOR_TEXTCURROW] = RGB(0xF0, 0xF0, 0x50);
+ CustomColors[MODCOLOR_BACKSELECTED] = RGB(0x40, 0x40, 0xA0);
CustomColors[MODCOLOR_TEXTSELECTED] = RGB(0xFF, 0xFF, 0xFF);
- CustomColors[MODCOLOR_BACKPLAYCURSOR] = RGB(0x49, 0x75, 0x82);
- CustomColors[MODCOLOR_TEXTPLAYCURSOR] = RGB(0xFF, 0xFF, 0xFF);
- CustomColors[MODCOLOR_BACKHILIGHT] = RGB(0x27, 0x41, 0x47);
- CustomColors[MODCOLOR_NOTE] = RGB(0xFF, 0xFF, 0x82);
- CustomColors[MODCOLOR_INSTRUMENT] = RGB(0xFF, 0xFF, 0x82);
- CustomColors[MODCOLOR_VOLUME] = RGB(0xFF, 0xFF, 0x82);
- CustomColors[MODCOLOR_PANNING] = RGB(0xFF, 0xFF, 0x82);
- CustomColors[MODCOLOR_PITCH] = RGB(0xFF, 0xFF, 0x82);
- CustomColors[MODCOLOR_GLOBALS] = RGB(0xFF, 0xFF, 0x82);
- CustomColors[MODCOLOR_SAMPLE] = RGB(0xFF, 0xFF, 0x82);
- CustomColors[MODCOLOR_ENVELOPES] = RGB(0xFF, 0xFF, 0x82);
- CustomColors[MODCOLOR_VUMETER_LO] = RGB(0x4B, 0x7C, 0x89);
- CustomColors[MODCOLOR_VUMETER_MED] = RGB(0x5F, 0x98, 0xA7);
- CustomColors[MODCOLOR_VUMETER_HI] = RGB(0xEA, 0x1C, 0x78);
- CustomColors[MODCOLOR_SEPSHADOW] = RGB(0x18, 0x28, 0x2C);
- CustomColors[MODCOLOR_SEPFACE] = RGB(0x49, 0x75, 0x82);
- CustomColors[MODCOLOR_SEPHILITE] = RGB(0x8A, 0xDB, 0xF3);
- CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x27, 0x41, 0x47);
+ CustomColors[MODCOLOR_SAMPLE] = RGB(0xFF, 0x00, 0x00);
+ CustomColors[MODCOLOR_BACKPLAYCURSOR] = RGB(0x50, 0x50, 0x70);
+ CustomColors[MODCOLOR_TEXTPLAYCURSOR] = RGB(0xE0, 0xE0, 0x40);
+ CustomColors[MODCOLOR_BACKHILIGHT] = RGB(0x40, 0x40, 0x80);
+ CustomColors[MODCOLOR_NOTE] = RGB(0xE0, 0xE0, 0x40);
+ CustomColors[MODCOLOR_INSTRUMENT] = RGB(0xFF, 0xFF, 0x00);
+ CustomColors[MODCOLOR_VOLUME] = RGB(0x00, 0xFF, 0x00);
+ CustomColors[MODCOLOR_PANNING] = RGB(0x00, 0xFF, 0xFF);
+ CustomColors[MODCOLOR_PITCH] = RGB(0xFF, 0xFF, 0x00);
+ CustomColors[MODCOLOR_GLOBALS] = RGB(0xFF, 0x40, 0x40);
+ CustomColors[MODCOLOR_ENVELOPES] = RGB(0x00, 0x00, 0xFF);
+ CustomColors[MODCOLOR_VUMETER_LO] = RGB(0x00, 0xC8, 0x00);
+ CustomColors[MODCOLOR_VUMETER_MED] = RGB(0xFF, 0xC8, 0x00);
+ CustomColors[MODCOLOR_VUMETER_HI] = RGB(0xE1, 0x00, 0x00);
+ CustomColors[MODCOLOR_SEPSHADOW] = RGB(0x2E, 0x2E, 0x5C);
+ CustomColors[MODCOLOR_SEPFACE] = RGB(0x40, 0x40, 0x80);
+ CustomColors[MODCOLOR_SEPHILITE] = RGB(0x99, 0x99, 0xCC);
+ CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x2E, 0x2E, 0x5A);
OnPreviewChanged();
}
@@ -453,30 +454,31 @@
void COptionsColors::OnPresetIT()
//-------------------------------
{
+ // "green"
CustomColors[MODCOLOR_BACKNORMAL] = RGB(0x00, 0x00, 0x00);
- CustomColors[MODCOLOR_TEXTNORMAL] = RGB(0x45, 0x9A, 0x49);
- CustomColors[MODCOLOR_BACKCURROW] = RGB(0x10, 0x35, 0x00);
- CustomColors[MODCOLOR_TEXTCURROW] = RGB(0xEB, 0xEB, 0xCB);
- CustomColors[MODCOLOR_BACKSELECTED] = RGB(0x20, 0x55, 0x00);
- CustomColors[MODCOLOR_TEXTSELECTED] = RGB(0xEB, 0xEB, 0xCB);
- CustomColors[MODCOLOR_BACKPLAYCURSOR] = RGB(0x59, 0x41, 0x3C);
- CustomColors[MODCOLOR_TEXTPLAYCURSOR] = RGB(0x45, 0x9A, 0x49);
- CustomColors[MODCOLOR_BACKHILIGHT] = RGB(0x59, 0x41, 0x3C);
- CustomColors[MODCOLOR_NOTE] = RGB(0x45, 0x9A, 0x49);
- CustomColors[MODCOLOR_INSTRUMENT] = RGB(0x38, 0x9E, 0x75);
- CustomColors[MODCOLOR_VOLUME] = RGB(0xA2, 0xA2, 0xA2);
- CustomColors[MODCOLOR_PANNING] = RGB(0x18, 0x75, 0x2C);
- CustomColors[MODCOLOR_PITCH] = RGB(0x45, 0x9A, 0x49);
- CustomColors[MODCOLOR_GLOBALS] = RGB(0x45, 0x9A, 0x49);
- CustomColors[MODCOLOR_SAMPLE] = RGB(0x8E, 0x14, 0x55);
- CustomColors[MODCOLOR_ENVELOPES] = RGB(0xA2, 0xA2, 0xA2);
- CustomColors[MODCOLOR_VUMETER_LO] = RGB(0x25, 0x7D, 0x00);
- CustomColors[MODCOLOR_VUMETER_MED] = RGB(0xEC, 0x99, 0x00);
+ CustomColors[MODCOLOR_TEXTNORMAL] = RGB(0x00, 0xE0, 0x00);
+ CustomColors[MODCOLOR_BACKCURROW] = RGB(0x70, 0x70, 0x70);
+ CustomColors[MODCOLOR_TEXTCURROW] = RGB(0x00, 0xE0, 0x00);
+ CustomColors[MODCOLOR_BACKSELECTED] = RGB(0xE0, 0xE0, 0xE0);
+ CustomColors[MODCOLOR_TEXTSELECTED] = RGB(0x00, 0x00, 0x00);
+ CustomColors[MODCOLOR_SAMPLE] = RGB(0xFF, 0x00, 0x00);
+ CustomColors[MODCOLOR_BACKPLAYCURSOR] = RGB(0x80, 0x80, 0x00);
+ CustomColors[MODCOLOR_TEXTPLAYCURSOR] = RGB(0x00, 0xE0, 0x00);
+ CustomColors[MODCOLOR_BACKHILIGHT] = RGB(0x40, 0x68, 0x40);
+ CustomColors[MODCOLOR_NOTE] = RGB(0x00, 0xFF, 0x00);
+ CustomColors[MODCOLOR_INSTRUMENT] = RGB(0xFF, 0xFF, 0x00);
+ CustomColors[MODCOLOR_VOLUME] = RGB(0x00, 0xFF, 0x00);
+ CustomColors[MODCOLOR_PANNING] = RGB(0x00, 0xFF, 0xFF);
+ CustomColors[MODCOLOR_PITCH] = RGB(0xFF, 0xFF, 0x00);
+ CustomColors[MODCOLOR_GLOBALS] = RGB(0xFF, 0x40, 0x40);
+ CustomColors[MODCOLOR_ENVELOPES] = RGB(0x00, 0x00, 0xFF);
+ CustomColors[MODCOLOR_VUMETER_LO] = RGB(0x00, 0xC8, 0x00);
+ CustomColors[MODCOLOR_VUMETER_MED] = RGB(0xFF, 0xC8, 0x00);
CustomColors[MODCOLOR_VUMETER_HI] = RGB(0xE1, 0x00, 0x00);
- CustomColors[MODCOLOR_SEPSHADOW] = RGB(0xB6, 0x96, 0x79);
- CustomColors[MODCOLOR_SEPFACE] = RGB(0xB6, 0x96, 0x79);
- CustomColors[MODCOLOR_SEPHILITE] = RGB(0xB6, 0x96, 0x79);
- CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x35, 0x27, 0x24);
+ CustomColors[MODCOLOR_SEPSHADOW] = RGB(0x23, 0x38, 0x23);
+ CustomColors[MODCOLOR_SEPFACE] = RGB(0x40, 0x68, 0x40);
+ CustomColors[MODCOLOR_SEPHILITE] = RGB(0x94, 0xBC, 0x94);
+ CustomColors[MODCOLOR_BLENDCOLOR] = RGB(0x00, 0x40, 0x00);
OnPreviewChanged();
}
@@ -612,7 +614,7 @@
{PATTERN_SINGLEEXPAND, "Single click to expand tree", "Single-clicking in the left tree view will expand a branch"},
{PATTERN_MUTECHNMODE, "Ignored muted channels", "Notes will not be played on muted channels (unmuting will only start on a new note)."},
{PATTERN_AUTOSPACEBAR, "Quick cursor paste Auto-Repeat", "Leaving the space bar pressed will auto-repeat the action"},
- {PATTERN_NOEXTRALOUD, "No loud samples", "Disable loud playback of samples in the sample/instrument editor"},
+ {PATTERN_NOEXTRALOUD, "No loud samples", "Disable loud playback of samples in the sample/instrument editor. Sample volume depends on the sample volume slider on the general tab when activated."},
{PATTERN_SHOWPREVIOUS, "Show Prev/Next patterns", "Displays grayed-out version of the previous/next patterns in the pattern editor. Does not work if \"always center active row\" is disabled."},
{PATTERN_CONTSCROLL, "Continuous scroll", "Jumps to the next pattern when moving past the end of a pattern"},
{PATTERN_KBDNOTEOFF, "Record note off", "Record note off when a key is released on the PC keyboard (Only works in instrument mode)."},
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2010-01-09 20:06:18 UTC (rev 460)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2010-01-10 14:50:33 UTC (rev 461)
@@ -298,7 +298,7 @@
END
IDD_OPTIONS_COLORS DIALOGEX 0, 0, 272, 281
-STYLE DS_SETFONT | DS_3DLOOK | WS_CHILD | WS_DISABLED | WS_CAPTION
+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION
CAPTION "Colours"
FONT 8, "MS Shell Dlg", 0, 0, 0x0
BEGIN
@@ -309,10 +309,10 @@
EDITTEXT IDC_SECONDARYHILITE,114,108,21,12,ES_AUTOHSCROLL | ES_NUMBER
CONTROL "Enable effect highlighting",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,60,114,10
CONTROL "Use small font",IDC_CHECK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,45,102,10
- PUSHBUTTON "MPT",IDC_BUTTON5,144,246,24,15
- PUSHBUTTON "FT2",IDC_BUTTON6,204,246,24,15
- PUSHBUTTON "IT",IDC_BUTTON7,174,246,24,15
- PUSHBUTTON "Buzz",IDC_BUTTON8,234,246,24,15
+ PUSHBUTTON "MPT",IDC_BUTTON5,126,246,30,15
+ PUSHBUTTON "Blue",IDC_BUTTON6,198,246,30,15
+ PUSHBUTTON "Green",IDC_BUTTON7,162,246,30,15
+ PUSHBUTTON "Buzz",IDC_BUTTON8,234,246,30,15
CONTROL "Colour",IDC_BUTTON1,"Button",BS_OWNERDRAW,25,194,51,15
CONTROL "Colour",IDC_BUTTON2,"Button",BS_OWNERDRAW,98,194,51,15
CONTROL "Colour",IDC_BUTTON3,"Button",BS_OWNERDRAW,168,194,51,15
@@ -326,8 +326,8 @@
CONTROL "",IDC_BUTTON4,"Button",BS_OWNERDRAW | BS_FLAT,65,130,114,43
CONTROL "Set highlights to songs' time signatures",IDC_CHECK5,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,75,136,10
- PUSHBUTTON "Load...",IDC_LOAD_COLORSCHEME,18,246,48,15
- PUSHBUTTON "Save...",IDC_SAVE_COLORSCHEME,72,246,48,15
+ PUSHBUTTON "Load...",IDC_LOAD_COLORSCHEME,18,246,42,15
+ PUSHBUTTON "Save...",IDC_SAVE_COLORSCHEME,66,246,42,15
GROUPBOX "Colour Presets",IDC_STATIC,6,228,264,42
END
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-09 20:06:39
|
Revision: 460
http://modplug.svn.sourceforge.net/modplug/?rev=460&view=rev
Author: saga-games
Date: 2010-01-09 20:06:18 +0000 (Sat, 09 Jan 2010)
Log Message:
-----------
[Fix] Mod Loaders: Very short sample sustain loops are now also accepted (similar fix to normal loop points)
[Fix] Order list: Fixed display error when selecting multiple orders, inserting them and clicking on another order (only first order of previous selection was un-highlighted)
[Imp] VST Editor: When dealing with midi learn in vst editors (with Shift key), also accept child windows of the VST editor as valid window. This still doesn't fix the Shift+clicking sliders issue in Synth1, but might help with other plugins.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_pat.h
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/soundlib/Sndfile.cpp
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.h 2010-01-08 20:56:53 UTC (rev 459)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.h 2010-01-09 20:06:18 UTC (rev 460)
@@ -44,7 +44,6 @@
BOOL Init(const CRect&, CCtrlPatterns *pParent, CModDoc *, HFONT hFont);
void InvalidateSelection() const;
UINT GetCurrentPattern() const;
- ORD_SELECTION GetCurSel(bool bIgnoreSelection) const;
// make the current selection the secondary selection (used for keyboard orderlist navigation)
inline void SetCurSelTo2ndSel(bool isSelectionKeyPressed)
{ if(isSelectionKeyPressed && m_nScrollPos2nd == ORDERINDEX_INVALID) m_nScrollPos2nd = m_nScrollPos;
@@ -58,6 +57,10 @@
ORDERINDEX GetOrderFromPoint(const CRect& rect, const CPoint& pt) const;
+ // Get the currently selected pattern(s).
+ // Set bIgnoreSelection to true if only the first selected point is important.
+ ORD_SELECTION GetCurSel(bool bIgnoreSelection) const;
+
// Sets target margin value and returns the effective margin value.
BYTE SetMargins(int);
@@ -83,6 +86,9 @@
// is not interpreted to be in margins regardless of the margin value.
bool IsOrderInMargins(int order, int startOrder);
+ // Ensure that a given order index is visible in the orderlist view.
+ void EnsureVisible(ORDERINDEX order);
+
// Set given sqeuence and update orderlist display.
void SelectSequence(const SEQUENCEINDEX nSeq);
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2010-01-08 20:56:53 UTC (rev 459)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2010-01-09 20:06:18 UTC (rev 460)
@@ -71,7 +71,7 @@
BYTE COrderList::s_nDefaultMargins = 0;
bool COrderList::IsOrderInMargins(int order, int startOrder)
-//-----------------------------------------------------
+//----------------------------------------------------------
{
const BYTE nMargins = GetMargins();
return ((startOrder != 0 && order - startOrder < nMargins) ||
@@ -79,6 +79,29 @@
}
+void COrderList::EnsureVisible(ORDERINDEX order)
+//----------------------------------------------
+{
+ // nothing needs to be done
+ if(!IsOrderInMargins(order, m_nXScroll) || order == ORDERINDEX_INVALID) return;
+
+ if(order < m_nXScroll)
+ {
+ if(order < GetMargins())
+ m_nXScroll = 0;
+ else
+ m_nXScroll = order - GetMargins();
+ } else
+ {
+ m_nXScroll = order + 2 * GetMargins() - 1;
+ if(m_nXScroll < GetLength())
+ m_nXScroll = 0;
+ else
+ m_nXScroll -= GetLength();
+ }
+}
+
+
COrderList::COrderList()
//----------------------
{
@@ -235,6 +258,7 @@
return result;
}
+
bool COrderList::SetCurSel(ORDERINDEX sel, bool bEdit, bool bShiftClick, bool bIgnoreCurSel)
//------------------------------------------------------------------------------------------
{
@@ -1165,6 +1189,12 @@
m_nScrollPos2nd = min(m_nScrollPos + nInsertCount, pSndFile->Order.GetLastIndex());
else
m_nScrollPos2nd = ORDERINDEX_INVALID;
+
+ InvalidateSelection();
+ EnsureVisible(m_nScrollPos2nd);
+ // first inserted order has higher priority than the last one
+ EnsureVisible(m_nScrollPos);
+
InvalidateRect(NULL, FALSE);
m_pModDoc->SetModified();
m_pModDoc->UpdateAllViews(NULL, HINT_MODSEQUENCE, this);
@@ -1324,7 +1354,7 @@
BYTE COrderList::SetMargins(int i)
-//----------------------------------------------
+//--------------------------------
{
m_nOrderlistMargins = static_cast<BYTE>(i);
return GetMargins();
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2010-01-08 20:56:53 UTC (rev 459)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2010-01-09 20:06:18 UTC (rev 460)
@@ -669,7 +669,7 @@
pModDoc->RecordParamChange(pVstPlugin->GetSlot(), index);
}
- if (pModDoc && CMainFrame::GetInputHandler()->ShiftPressed() && pVstPlugin->GetEditor() && (pVstPlugin->GetEditor()->m_hWnd == ::GetForegroundWindow()))
+ if (pModDoc && CMainFrame::GetInputHandler()->ShiftPressed() && pVstPlugin->GetEditor() && (pVstPlugin->GetEditor()->m_hWnd == ::GetForegroundWindow() || ::IsChild(pVstPlugin->GetEditor()->m_hWnd, ::GetForegroundWindow())))
{
CMainFrame::GetInputHandler()->SetModifierMask(0); // Make sure that the dialog will open only once.
CAbstractVstEditor *pVstEditor = pVstPlugin->GetEditor();
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2010-01-08 20:56:53 UTC (rev 459)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2010-01-09 20:06:18 UTC (rev 460)
@@ -667,7 +667,7 @@
pSmp->nLoopEnd = 0;
}
if (pSmp->nSustainEnd > pSmp->nLength) pSmp->nSustainEnd = pSmp->nLength;
- if (pSmp->nSustainStart + 3 >= pSmp->nSustainEnd)
+ if (pSmp->nSustainStart >= pSmp->nSustainEnd)
{
pSmp->nSustainStart = 0;
pSmp->nSustainEnd = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-08 20:57:02
|
Revision: 459
http://modplug.svn.sourceforge.net/modplug/?rev=459&view=rev
Author: saga-games
Date: 2010-01-08 20:56:53 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
[New] Mod Conversion: When converting a song that has subsongs to MPTM format, the user is asked if those subsongs should be converted into multiple sequences.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Moddoc.h
trunk/OpenMPT/mptrack/Modedit.cpp
Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h 2010-01-08 12:14:54 UTC (rev 458)
+++ trunk/OpenMPT/mptrack/Moddoc.h 2010-01-08 20:56:53 UTC (rev 459)
@@ -289,6 +289,7 @@
BOOL RemoveChannels(BOOL bChnMask[MAX_CHANNELS]);
bool MergeSequences();
+ bool ConvertSubsongsToMultipleSequences();
bool m_bHasValidPath; //becomes true if document is loaded or saved.
// Fix: save pattern scrollbar position when switching to other tab
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2010-01-08 12:14:54 UTC (rev 458)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2010-01-08 20:56:53 UTC (rev 459)
@@ -372,7 +372,27 @@
ChangeFileExtension(nNewType);
// Multisequences not suppported by other formats
- if(!(m_SndFile.m_nType & MOD_TYPE_MPT)) MergeSequences();
+ if(!(m_SndFile.GetType() == MOD_TYPE_MPT)) MergeSequences();
+ // Convert sequence with separator patterns into multiple sequences?
+ if(m_SndFile.GetType() == MOD_TYPE_MPT && m_SndFile.Order.GetNumSequences() == 1)
+ {
+ bool hasSepPatterns = false;
+ for(ORDERINDEX nOrd = 0; nOrd < m_SndFile.Order.GetLengthTailTrimmed(); nOrd++)
+ {
+ if(!m_SndFile.Patterns.IsValidIndex(m_SndFile.Order[nOrd]))
+ {
+ hasSepPatterns = true;
+ break;
+ }
+ }
+ if(hasSepPatterns &&
+ ::MessageBox(NULL,
+ "The order list contains separator items.\nThe new format supports multiple sequences, do you want to convert those separate tracks into multiple song sequences?",
+ "Order list conversion", MB_YESNO | MB_ICONQUESTION) == IDYES)
+ {
+ ConvertSubsongsToMultipleSequences();
+ }
+ }
//rewbs.cutomKeys: update effect key commands
CInputHandler *ih = CMainFrame::GetMainFrame()->GetInputHandler();
@@ -1709,3 +1729,70 @@
return true;
}
+
+// Split subsongs (separated by "---" or "+++" patterns) into sequences
+bool CModDoc::ConvertSubsongsToMultipleSequences()
+//------------------------------------------------
+{
+ if(m_SndFile.GetType() != MOD_TYPE_MPT || m_SndFile.Order.GetNumSequences() != 1) return false;
+ bool modified = false;
+
+ m_SndFile.Order.SetSequence(0);
+ for(ORDERINDEX nOrd = 0; nOrd < m_SndFile.Order.GetLengthTailTrimmed(); nOrd++)
+ {
+ // end of subsong?
+ if(!m_SndFile.Patterns.IsValidIndex(m_SndFile.Order[nOrd]))
+ {
+ ORDERINDEX oldLength = m_SndFile.Order.GetLengthTailTrimmed();
+ // remove all separator patterns between current and next subsong first
+ while(nOrd < oldLength && (!m_SndFile.Patterns.IsValidIndex(m_SndFile.Order[nOrd])))
+ {
+ m_SndFile.Order[nOrd] = m_SndFile.Order.GetInvalidPatIndex();
+ nOrd++;
+ modified = true;
+ }
+ if(nOrd >= oldLength) break;
+ ORDERINDEX startOrd = nOrd;
+ modified = true;
+
+ m_SndFile.Order.AddSequence(false);
+ SEQUENCEINDEX newSeq = m_SndFile.Order.GetNumSequences() - 1;
+ m_SndFile.Order.SetSequence(newSeq);
+
+ // resize new seqeuence if necessary
+ if(m_SndFile.Order.GetLength() < oldLength - startOrd)
+ {
+ m_SndFile.Order.resize(oldLength - startOrd);
+ }
+
+ // now, move all following orders to the new sequence
+ while(nOrd < oldLength)
+ {
+ PATTERNINDEX copyPat = m_SndFile.Order.GetSequence(newSeq - 1)[nOrd];
+ m_SndFile.Order[nOrd - startOrd] = copyPat;
+ nOrd++;
+
+ // is this a valid pattern? adjust pattern jump commands, if necessary.
+ if(m_SndFile.Patterns.IsValidPat(copyPat))
+ {
+ MODCOMMAND *m = m_SndFile.Patterns[copyPat];
+ for (UINT len = m_SndFile.PatternSize[copyPat] * m_SndFile.m_nChannels; len; m++, len--)
+ {
+ if(m->command == CMD_POSITIONJUMP && m->param >= startOrd)
+ {
+ m->param -= startOrd;
+ }
+ }
+ }
+ }
+ m_SndFile.Order.SetSequence(newSeq - 1);
+ m_SndFile.Order.Remove(startOrd, oldLength - 1);
+ m_SndFile.Order.SetSequence(newSeq);
+ // start from beginning...
+ nOrd = 0;
+ if(m_SndFile.Order.GetLengthTailTrimmed() == 0 || !m_SndFile.Patterns.IsValidIndex(m_SndFile.Order[nOrd])) break;
+ }
+ }
+ m_SndFile.Order.SetSequence(0);
+ return modified;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-08 12:50:23
|
Revision: 458
http://modplug.svn.sourceforge.net/modplug/?rev=458&view=rev
Author: saga-games
Date: 2010-01-08 12:14:54 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
[Fix] Instrument Editor: Well, apparently there WAS a reason to not use InvalidateRect (Toggling loop points did not update the toolbar)
Modified Paths:
--------------
trunk/OpenMPT/mptrack/View_ins.cpp
Modified: trunk/OpenMPT/mptrack/View_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp 2010-01-08 12:01:38 UTC (rev 457)
+++ trunk/OpenMPT/mptrack/View_ins.cpp 2010-01-08 12:14:54 UTC (rev 458)
@@ -2366,7 +2366,7 @@
if(!EnvGetLoop())
EnvSetLoopStart(0);
EnvSetLoopStart(m_nDragItem - 1);
- InvalidateRect(NULL, FALSE);
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2381,7 +2381,7 @@
EnvSetLoopStart(0);
}
EnvSetLoopEnd(m_nDragItem - 1);
- InvalidateRect(NULL, FALSE);
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2393,7 +2393,7 @@
if(!EnvGetSustain())
EnvSetSustain(true);
EnvSetSustainStart(m_nDragItem - 1);
- InvalidateRect(NULL, FALSE);
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2408,7 +2408,7 @@
EnvSetSustainStart(0);
}
EnvSetSustainEnd(m_nDragItem - 1);
- InvalidateRect(NULL, FALSE);
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2419,8 +2419,9 @@
if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
if(EnvToggleReleaseNode(m_nDragItem - 1))
{
- GetDocument()->SetModified();
- InvalidateRect(NULL, FALSE);
+ CModDoc *pModDoc = GetDocument(); // sanity checks are done in GetEnvelopePtr() already
+ pModDoc->SetModified();
+ pModDoc->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-08 12:01:48
|
Revision: 457
http://modplug.svn.sourceforge.net/modplug/?rev=457&view=rev
Author: saga-games
Date: 2010-01-08 12:01:38 +0000 (Fri, 08 Jan 2010)
Log Message:
-----------
[Fix] Instrument Editor: Toggle Release Node was buggy
[Ref] Minor improvements
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/View_ins.cpp
trunk/OpenMPT/mptrack/View_ins.h
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2010-01-07 17:10:05 UTC (rev 456)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2010-01-08 12:01:38 UTC (rev 457)
@@ -247,14 +247,16 @@
::EnableWindow(::GetDlgItem(m_hWnd, IDC_PATINSTROPLUGGUI), false);
// Enable/disable multisequence controls according the current modtype.
- GetDlgItem(IDC_STATIC_SEQUENCE_NAME)->EnableWindow( (m_pSndFile->GetType() == MOD_TYPE_MPT) ? SW_SHOW : SW_HIDE);
- GetDlgItem(IDC_EDIT_SEQUENCE_NAME)->EnableWindow( (m_pSndFile->GetType() == MOD_TYPE_MPT) ? SW_SHOW : SW_HIDE);
- GetDlgItem(IDC_EDIT_SEQNUM)->EnableWindow( (m_pSndFile->GetType() == MOD_TYPE_MPT) ? SW_SHOW : SW_HIDE);
- GetDlgItem(IDC_SPIN_SEQNUM)->EnableWindow( (m_pSndFile->GetType() == MOD_TYPE_MPT) ? SW_SHOW : SW_HIDE);
+ BOOL isMultiSeqAvail = (m_pSndFile->GetType() == MOD_TYPE_MPT) ? TRUE : FALSE;
+ GetDlgItem(IDC_STATIC_SEQUENCE_NAME)->EnableWindow(isMultiSeqAvail);
+ GetDlgItem(IDC_EDIT_SEQUENCE_NAME)->EnableWindow(isMultiSeqAvail);
+ GetDlgItem(IDC_EDIT_SEQNUM)->EnableWindow(isMultiSeqAvail);
+ GetDlgItem(IDC_SPIN_SEQNUM)->EnableWindow(isMultiSeqAvail);
// Enable/disable pattern names
- GetDlgItem(IDC_STATIC_PATTERNNAME)->EnableWindow( (m_pSndFile->GetType() & (MOD_TYPE_MPT|MOD_TYPE_IT|MOD_TYPE_XM)) ? SW_SHOW : SW_HIDE);
- GetDlgItem(IDC_EDIT_PATTERNNAME)->EnableWindow( (m_pSndFile->GetType() & (MOD_TYPE_MPT|MOD_TYPE_IT|MOD_TYPE_XM)) ? SW_SHOW : SW_HIDE);
+ BOOL isPatNameAvail = (m_pSndFile->GetType() & (MOD_TYPE_MPT|MOD_TYPE_IT|MOD_TYPE_XM)) ? TRUE : FALSE;
+ GetDlgItem(IDC_STATIC_PATTERNNAME)->EnableWindow(isPatNameAvail);
+ GetDlgItem(IDC_EDIT_PATTERNNAME)->EnableWindow(isPatNameAvail);
}
//end rewbs.instroVST
if (dwHintMask & HINT_MPTOPTIONS)
@@ -1253,3 +1255,4 @@
m_OrderList.SelectSequence(newSeq);
}
}
+
Modified: trunk/OpenMPT/mptrack/View_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp 2010-01-07 17:10:05 UTC (rev 456)
+++ trunk/OpenMPT/mptrack/View_ins.cpp 2010-01-08 12:01:38 UTC (rev 457)
@@ -1436,7 +1436,7 @@
{
BOOL bChanged = FALSE;
if (pt.x >= m_rcClient.right - 2) nTick++;
- if (m_nDragItem <= MAX_ENVPOINTS)
+ if (IsDragItemEnvPoint())
{
bChanged = EnvSetValue(m_nDragItem - 1, nTick, nVal);
} else
@@ -1597,11 +1597,8 @@
{
SetCapture();
m_dwStatus |= INSSTATUS_DRAGGING;
- // refrsh active node colour
- if(GetDocument())
- {
- GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
- }
+ // refresh active node colour
+ InvalidateRect(NULL, FALSE);
}
else
{
@@ -1757,10 +1754,9 @@
}
void CViewInstrument::OnEnvToggleReleasNode()
-//---------------------------------------------------
+//-------------------------------------------
{
- if(m_nDragItem < 2 || m_nDragItem >= EnvGetLastPoint()) return;
- if(EnvToggleReleaseNode(m_nDragItem - 1))
+ if(IsDragItemEnvPoint() && EnvToggleReleaseNode(m_nDragItem - 1))
{
if(GetDocument() != nullptr) GetDocument()->SetModified();
InvalidateRect(NULL, FALSE);
@@ -2258,7 +2254,7 @@
m_nDragItem = pEnv->nNodes;
else
m_nDragItem--;
- GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
+ InvalidateRect(NULL, FALSE);
}
@@ -2271,7 +2267,7 @@
m_nDragItem = 1;
else
m_nDragItem++;
- GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
+ InvalidateRect(NULL, FALSE);
}
@@ -2279,14 +2275,13 @@
//-----------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
if(m_nDragItem == 1 || pEnv->Ticks[m_nDragItem - 1] == pEnv->Ticks[m_nDragItem - 2])
return;
pEnv->Ticks[m_nDragItem - 1]--;
- CModDoc *pModDoc = GetDocument(); // sanity checks are done in GetEnvelopePtr() already
- pModDoc->SetModified();
- GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
+ GetDocument()->SetModified(); // sanity checks are done in GetEnvelopePtr() already
+ InvalidateRect(NULL, FALSE);
}
@@ -2294,14 +2289,13 @@
//------------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
if(m_nDragItem == 1 || (m_nDragItem < pEnv->nNodes && pEnv->Ticks[m_nDragItem - 1] == pEnv->Ticks[m_nDragItem]))
return;
pEnv->Ticks[m_nDragItem - 1]++;
- CModDoc *pModDoc = GetDocument(); // sanity checks are done in GetEnvelopePtr() already
- pModDoc->SetModified();
- pModDoc->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
+ GetDocument()->SetModified(); // sanity checks are done in GetEnvelopePtr() already
+ InvalidateRect(NULL, FALSE);
}
@@ -2309,15 +2303,14 @@
//----------------------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
if(pEnv->Values[m_nDragItem - 1] <= 64 - stepsize)
pEnv->Values[m_nDragItem - 1] += stepsize;
else
pEnv->Values[m_nDragItem - 1] = 64;
- CModDoc *pModDoc = GetDocument(); // sanity checks are done in GetEnvelopePtr() already
- pModDoc->SetModified();
- pModDoc->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
+ GetDocument()->SetModified(); // sanity checks are done in GetEnvelopePtr() already
+ InvalidateRect(NULL, FALSE);
}
@@ -2325,15 +2318,14 @@
//------------------------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
if(pEnv->Values[m_nDragItem - 1] >= stepsize)
pEnv->Values[m_nDragItem - 1] -= stepsize;
else
pEnv->Values[m_nDragItem - 1] = 0;
- CModDoc *pModDoc = GetDocument(); // sanity checks are done in GetEnvelopePtr() already
- pModDoc->SetModified();
- pModDoc->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
+ GetDocument()->SetModified(); // sanity checks are done in GetEnvelopePtr() already
+ InvalidateRect(NULL, FALSE);
}
void CViewInstrument::EnvKbdInsertPoint()
@@ -2341,7 +2333,7 @@
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
if(pEnv == nullptr) return;
- if(m_nDragItem > pEnv->nNodes) m_nDragItem = pEnv->nNodes;
+ if(!IsDragItemEnvPoint()) m_nDragItem = pEnv->nNodes;
WORD newTick = pEnv->Ticks[pEnv->nNodes - 1] + 4; // if last point is selected: add point after last point
BYTE newVal = pEnv->Values[pEnv->nNodes - 1];
// if some other point is selected: interpolate between this and next point (if there's room between them)
@@ -2360,7 +2352,7 @@
//---------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || pEnv->nNodes == 0) return;
+ if(pEnv == nullptr || !IsDragItemEnvPoint() || pEnv->nNodes == 0) return;
if(m_nDragItem > pEnv->nNodes) m_nDragItem = pEnv->nNodes;
EnvRemovePoint(m_nDragItem - 1);
}
@@ -2370,11 +2362,11 @@
//----------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
if(!EnvGetLoop())
EnvSetLoopStart(0);
EnvSetLoopStart(m_nDragItem - 1);
- GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
+ InvalidateRect(NULL, FALSE);
}
@@ -2382,14 +2374,14 @@
//--------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
if(!EnvGetLoop())
{
EnvSetLoop(true);
EnvSetLoopStart(0);
}
EnvSetLoopEnd(m_nDragItem - 1);
- GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
+ InvalidateRect(NULL, FALSE);
}
@@ -2397,11 +2389,11 @@
//-------------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
if(!EnvGetSustain())
EnvSetSustain(true);
EnvSetSustainStart(m_nDragItem - 1);
- GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
+ InvalidateRect(NULL, FALSE);
}
@@ -2409,14 +2401,14 @@
//-----------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
if(!EnvGetSustain())
{
EnvSetSustain(true);
EnvSetSustainStart(0);
}
EnvSetSustainEnd(m_nDragItem - 1);
- GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
+ InvalidateRect(NULL, FALSE);
}
@@ -2424,9 +2416,12 @@
//---------------------------------------------
{
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
- if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
- EnvToggleReleaseNode(m_nDragItem - 1);
- GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
+ if(pEnv == nullptr || !IsDragItemEnvPoint()) return;
+ if(EnvToggleReleaseNode(m_nDragItem - 1))
+ {
+ GetDocument()->SetModified();
+ InvalidateRect(NULL, FALSE);
+ }
}
Modified: trunk/OpenMPT/mptrack/View_ins.h
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.h 2010-01-07 17:10:05 UTC (rev 456)
+++ trunk/OpenMPT/mptrack/View_ins.h 2010-01-08 12:01:38 UTC (rev 457)
@@ -109,6 +109,8 @@
void EnvKbdSetSustainEnd();
void EnvKbdToggleReleaseNode();
+ bool IsDragItemEnvPoint() const { return (m_nDragItem < 1 || m_nDragItem > EnvGetLastPoint() + 1) ? false : true; }
+
////////////////////////
// Misc stuff
void UpdateScrollSize();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rel...@us...> - 2010-01-07 17:10:27
|
Revision: 456
http://modplug.svn.sourceforge.net/modplug/?rev=456&view=rev
Author: relabsoluness
Date: 2010-01-07 17:10:05 +0000 (Thu, 07 Jan 2010)
Log Message:
-----------
[New] Tuning: Can import scl-files. Upper limit for note count is 64.
[Imp] SoundTouch: Update to version 1.5.0.
[Mod] XM/MOD: Allow extended XM/MOD files to use '+++'-items again.
[Fix] Orderlist: Deleting orders didn't set document modified (appeared in rev. 406).
[Fix] GUI: Fixes to handling of 32 chars long instrument name.
[Ref/Fix/Mod] Minor tweaks and fixes (changed some "modplug tracker" strings to "OpenMPT", added a couple of utility functions, added tuning directory to existing default/working directory system...).
Modified Paths:
--------------
trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/Mptrack.h
trunk/OpenMPT/mptrack/TuningDialog.cpp
trunk/OpenMPT/mptrack/TuningDialog.h
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/misc_util.cpp
trunk/OpenMPT/mptrack/misc_util.h
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/mptrack/resource.h
trunk/OpenMPT/mptrack/test/test.cpp
trunk/OpenMPT/packageTemplate/SoundTouch/README.html
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/mod_specifications.h
trunk/OpenMPT/soundlib/tuningCollection.cpp
trunk/OpenMPT/soundlib/tuningbase.cpp
trunk/OpenMPT/soundlib/tuningbase.h
trunk/OpenMPT/soundlib/tuningcollection.h
trunk/OpenMPT/soundtouch/3dnow_win.cpp
trunk/OpenMPT/soundtouch/BPMDetect.cpp
trunk/OpenMPT/soundtouch/BPMDetect.h
trunk/OpenMPT/soundtouch/FIFOSampleBuffer.cpp
trunk/OpenMPT/soundtouch/FIFOSampleBuffer.h
trunk/OpenMPT/soundtouch/FIFOSamplePipe.h
trunk/OpenMPT/soundtouch/FIRFilter.cpp
trunk/OpenMPT/soundtouch/FIRFilter.h
trunk/OpenMPT/soundtouch/PeakFinder.cpp
trunk/OpenMPT/soundtouch/PeakFinder.h
trunk/OpenMPT/soundtouch/README.html
trunk/OpenMPT/soundtouch/RateTransposer.cpp
trunk/OpenMPT/soundtouch/RateTransposer.h
trunk/OpenMPT/soundtouch/STTypes.h
trunk/OpenMPT/soundtouch/SoundTouch.cpp
trunk/OpenMPT/soundtouch/SoundTouch.h
trunk/OpenMPT/soundtouch/TDStretch.cpp
trunk/OpenMPT/soundtouch/TDStretch.h
trunk/OpenMPT/soundtouch/cpu_detect_x86_win.cpp
trunk/OpenMPT/soundtouch/mmx_optimized.cpp
trunk/OpenMPT/soundtouch/sse_optimized.cpp
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -469,7 +469,7 @@
if (nIns==0 && (inputPlugs.GetSize() || inputChannels.GetSize())) {
m_pInputMenu->AppendMenu(MF_SEPARATOR);
}
- name.Format("Ins%02d: %s", inputInstruments[nIns], pSndFile->Instruments[inputInstruments[nIns]]->name);
+ name.Format("Ins%02d: %s", inputInstruments[nIns], (LPCTSTR)pSndFile->GetInstrumentName(inputInstruments[nIns]));
if (inputInstruments[nIns] == (UINT)m_nInstrument) checked=true;
m_pInputMenu->AppendMenu(MF_STRING|(checked?MF_CHECKED:0), ID_SELECTINST+inputInstruments[nIns], name);
}
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -1192,6 +1192,7 @@
pSndFile->Order.Remove(selection.nOrdLo, selection.nOrdHi);
+ m_pModDoc->SetModified();
InvalidateRect(NULL, FALSE);
m_pModDoc->UpdateAllViews(NULL, HINT_MODSEQUENCE, this);
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -310,6 +310,8 @@
for(UINT i = 0; i < NUM_DIRS; i++)
{
+ if (i == DIR_TUNING) // Hack: Tuning folder is set already so don't reset it.
+ continue;
m_szDefaultDirectory[i][0] = 0;
m_szWorkingDirectory[i][0] = 0;
}
Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/Mainfrm.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -372,6 +372,7 @@
DIR_PLUGINS,
DIR_PLUGINPRESETS,
DIR_EXPORT,
+ DIR_TUNING,
NUM_DIRS
};
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -3486,7 +3486,7 @@
{
const SAMPLEINDEX nSmp = m_SndFile.Instruments[nInstr]->Keyboard[60];
if (nSmp < ARRAYELEMCOUNT(m_SndFile.Samples) && m_SndFile.Samples[nSmp].pSample)
- instrumentName.Format(TEXT("s: %s"), (LPCTSTR)m_SndFile.GetSampleName(nSmp)); //60 is C-5
+ instrumentName.Format(TEXT("s: %s"), m_SndFile.GetSampleName(nSmp)); //60 is C-5
}
// Get plugin name.
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -790,12 +790,13 @@
}
// Create tunings dir
- strcpy(m_szTuningsDirectory, m_szConfigDirectory);
- strcat(m_szTuningsDirectory, "tunings\\");
+ CString sTuningPath;
+ sTuningPath.Format(TEXT("%stunings\\"), m_szConfigDirectory);
+ CMainFrame::SetDefaultDirectory(sTuningPath, DIR_TUNING);
- if(PathIsDirectory(m_szTuningsDirectory) == 0)
+ if(PathIsDirectory(CMainFrame::GetDefaultDirectory(DIR_TUNING)) == 0)
{
- CreateDirectory(m_szTuningsDirectory, 0);
+ CreateDirectory(CMainFrame::GetDefaultDirectory(DIR_TUNING), 0);
}
if(!bIsAppDir)
Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/Mptrack.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -155,7 +155,6 @@
MODMIDICFG m_MidiCfg;
TCHAR m_szExePath[_MAX_PATH];
TCHAR m_szConfigDirectory[_MAX_PATH];
- TCHAR m_szTuningsDirectory[_MAX_PATH];
TCHAR m_szConfigFileName[_MAX_PATH];
TCHAR m_szPluginCacheFileName[_MAX_PATH];
TCHAR m_szStringsFileName[_MAX_PATH];
@@ -202,7 +201,6 @@
BOOL IsDebug() const { return m_bDebugMode; }
LPCSTR GetConfigFileName() const { return m_szConfigFileName; }
LPCSTR GetPluginCacheFileName() const { return m_szPluginCacheFileName; }
- LPCSTR GetTuningsPath() const { return m_szTuningsDirectory; }
LPCSTR GetConfigPath() const { return m_szConfigDirectory; }
void SetupPaths();
@@ -439,6 +437,7 @@
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 TCHAR gszEmpty[] = TEXT("");
// Defined in load_mid.cpp
extern const LPCSTR szMidiProgramNames[128];
Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TuningDialog.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/TuningDialog.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -1,6 +1,7 @@
#include "stdafx.h"
#include "mptrack.h"
#include "TuningDialog.h"
+#include "MainFrm.h"
#include <algorithm>
#include "misc_util.h"
#include ".\tuningdialog.h"
@@ -627,7 +628,7 @@
FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(false, CTuning::s_FileExtension, "",
filter,
- theApp.GetTuningsPath());
+ CMainFrame::GetWorkingDirectory(DIR_TUNING));
if(files.abort) return;
BeginWaitCursor();
@@ -655,67 +656,141 @@
ErrorBox(IDS_ERR_EXPORT_TUNING, this);
}
+
void CTuningDialog::OnBnClickedButtonImport()
//-------------------------------------------
{
- //TODO: Ability to import ratios from text file.
- string filter = string("Tuning files (*") + CTuning::s_FileExtension + string(", *") + CTuningCollection::s_FileExtension + string(")|*") +
- CTuning::s_FileExtension + string(";*") + CTuningCollection::s_FileExtension + string("|");
+ CString sFilter;
+ sFilter.Format(TEXT("Tuning files (*%s, *%s, *.scl)|*%s;*%s;*.scl|"),
+ CTuning::s_FileExtension,
+ CTuningCollection::s_FileExtension,
+ CTuning::s_FileExtension,
+ CTuningCollection::s_FileExtension);
- FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(true, "", "",
- filter,
- theApp.GetTuningsPath());
- if(files.abort) return;
+ FileDlgResult files = CTrackApp::ShowOpenSaveFileDialog(true, TEXT(""), TEXT(""),
+ (LPCTSTR)sFilter,
+ CMainFrame::GetWorkingDirectory(DIR_TUNING),
+ true);
+ if(files.abort)
+ return;
- const string ext = string(".") + files.extension;
+ CMainFrame::SetWorkingDirectory(files.workingDirectory.c_str(), DIR_TUNING, true);
- bool failure = true;
+ CString sLoadReport;
- if(ext == CTuning::s_FileExtension)
+ const size_t nFiles = files.filenames.size();
+ for(size_t counter = 0; counter < nFiles; counter++)
{
- ifstream fin(files.first_file.c_str(), ios::binary);
- CTuning* pT = CTuningRTI::DeserializeOLD(fin);
- if(pT == 0) {fin.clear(); fin.seekg(0); pT = CTuningRTI::Deserialize(fin);}
- fin.close();
- if(pT)
+ TCHAR szFileName[_MAX_FNAME], szExt[_MAX_EXT];
+ _tsplitpath(files.filenames[counter].c_str(), nullptr, nullptr, szFileName, szExt);
+
+ _tcslwr(szExt); // Convert extension to lower case.
+
+ const bool bIsTun = (_tcscmp(szExt, CTuning::s_FileExtension) == 0);
+ const bool bIsScl = (_tcscmp(szExt, TEXT(".scl")) == 0);
+
+ if (bIsTun || bIsScl)
{
- failure = false;
- m_TempTunings.AddTuning(pT);
- m_pActiveTuning = pT;
+ CTuning* pT = nullptr;
- AddTreeItem(m_pActiveTuning, m_TreeItemTuningItemMap.GetMapping_21(TUNINGTREEITEM(&m_TempTunings)), NULL);
- UpdateView();
+ if (bIsTun)
+ {
+ std::ifstream fin(files.filenames[counter].c_str(), ios::binary);
+ pT = CTuningRTI::DeserializeOLD(fin);
+ if(pT == 0)
+ {fin.clear(); fin.seekg(0); pT = CTuningRTI::Deserialize(fin);}
+ fin.close();
+ if (pT)
+ {
+ if (m_TempTunings.AddTuning(pT) == true)
+ {
+ delete pT; pT = nullptr;
+ if (m_TempTunings.GetNumTunings() >= CTuningCollection::s_nMaxTuningCount)
+ {
+ CString sFormat, sMsg;
+ sFormat.LoadString(IDS_TUNING_IMPORT_LIMIT);
+ sMsg.FormatMessage(sFormat, szFileName, szExt, CTuningCollection::s_nMaxTuningCount);
+ sLoadReport += sMsg;
+ }
+ else // Case: Can't add tuning to tuning collection for unknown reason.
+ {
+ CString sMsg;
+ AfxFormatString2(sMsg, IDS_TUNING_IMPORT_UNKNOWN_FAILURE, szFileName, szExt);
+ sLoadReport += sMsg;
+ }
+ }
+ }
+ else // pT == nullptr
+ {
+ CString sMsg;
+ AfxFormatString2(sMsg, IDS_TUNING_IMPORT_UNRECOGNIZED_FILE, szFileName, szExt);
+ sLoadReport += sMsg;
+ }
+ }
+ else // scl import.
+ {
+ EnSclImport a = ImportScl(files.filenames[counter].c_str(), szFileName);
+ if (a != enSclImportOk)
+ {
+ if (a == enSclImportAddTuningFailure && m_TempTunings.GetNumTunings() >= CTuningCollection::s_nMaxTuningCount)
+ {
+ CString sFormat, sMsg;
+ sFormat.LoadString(IDS_TUNING_IMPORT_LIMIT);
+ sMsg.FormatMessage(sFormat, szFileName, szExt, CTuningCollection::s_nMaxTuningCount);
+ sLoadReport += sMsg;
+ }
+ else
+ {
+ CString sFormat, sMsg;
+ sFormat.LoadString(IDS_TUNING_IMPORT_SCL_FAILURE);
+ sMsg.FormatMessage(sFormat, szFileName, szExt, (LPCTSTR)GetSclImportFailureMsg(a));
+ sLoadReport += sMsg;
+ }
+ }
+ else // scl import successful.
+ pT = &m_TempTunings.GetTuning(m_TempTunings.GetNumTunings() - 1);
+ }
+
+ if (pT)
+ {
+ m_pActiveTuning = pT;
+ AddTreeItem(m_pActiveTuning, m_TreeItemTuningItemMap.GetMapping_21(TUNINGTREEITEM(&m_TempTunings)), NULL);
+ }
}
- }
- else
- {
- if(ext == CTuningCollection::s_FileExtension)
+ else if (_tcscmp(szExt, CTuningCollection::s_FileExtension) == 0)
{
- //For now only loading tuning collection as
- //a separate collection - no possibility to
- //directly replace some collection.
+ // For now only loading tuning collection as
+ // a separate collection - no possibility to
+ // directly replace some collection.
CTuningCollection* pNewTCol = new CTuningCollection;
- pNewTCol->SetSavefilePath(static_cast<LPCTSTR>(files.first_file.c_str()));
- failure = pNewTCol->Deserialize();
- if(failure)
+ pNewTCol->SetSavefilePath(files.filenames[counter].c_str());
+ if (pNewTCol->Deserialize())
{
delete pNewTCol; pNewTCol = 0;
+ CString sMsg;
+ AfxFormatString2(sMsg, IDS_TUNING_IMPORT_UNKNOWN_TC_FAILURE, szFileName, szExt);
+ sLoadReport += sMsg;
}
else
{
m_TuningCollections.push_back(pNewTCol);
m_DeletableTuningCollections.push_back(pNewTCol);
AddTreeItem(pNewTCol, NULL, NULL);
- UpdateView();
}
-
-
}
+ else // Case: Unknown extension (should not happen).
+ {
+ CString sMsg;
+ AfxFormatString2(sMsg, IDS_TUNING_IMPORT_UNRECOGNIZED_FILE_EXT, szFileName, szExt);
+ sLoadReport += sMsg;
+ }
}
- if(failure)
- ErrorBox(IDS_OPERATION_FAIL, this);
+ if (sLoadReport.GetLength() > 0)
+ AfxMessageBox(sLoadReport, MB_ICONINFORMATION);
+ UpdateView();
}
+
void CTuningDialog::OnEnChangeEditFinetunesteps()
//-----------------------------------------------
{
@@ -1325,3 +1400,187 @@
}
+////////////////////////////////////////////////////////
+//
+// scl import
+//
+////////////////////////////////////////////////////////
+
+typedef double SclFloat;
+
+CString CTuningDialog::GetSclImportFailureMsg(EnSclImport id)
+//----------------------------------------------------------
+{
+ CString sMsg;
+ switch(id)
+ {
+ case enSclImportFailTooManyNotes:
+ AfxFormatString1(sMsg, IDS_SCL_IMPORT_FAIL_8, Stringify(s_nSclImportMaxNoteCount).c_str());
+ return sMsg;
+
+ case enSclImportFailTooLargeNumDenomIntegers:
+ sMsg.LoadString(IDS_SCL_IMPORT_FAIL_1); return sMsg;
+
+ case enSclImportFailZeroDenominator:
+ sMsg.LoadString(IDS_SCL_IMPORT_FAIL_2); return sMsg;
+
+ case enSclImportFailNegativeRatio:
+ sMsg.LoadString(IDS_SCL_IMPORT_FAIL_3); return sMsg;
+
+ case enSclImportFailUnableToOpenFile:
+ sMsg.LoadString(IDS_SCL_IMPORT_FAIL_4); return sMsg;
+
+ case enSclImportLineCountMismatch:
+ sMsg.LoadString(IDS_SCL_IMPORT_FAIL_5); return sMsg;
+
+ case enSclImportTuningCreationFailure:
+ sMsg.LoadString(IDS_SCL_IMPORT_FAIL_6); return sMsg;
+
+ case enSclImportAddTuningFailure:
+ sMsg.LoadString(IDS_SCL_IMPORT_FAIL_7); return sMsg;
+
+ default:
+ return sMsg;
+ }
+}
+
+
+static void SkipCommentLines(std::istream& iStrm, std::string& str)
+//-----------------------------------------------------------------
+{
+ while(std::getline(iStrm, str))
+ {
+ LPCSTR psz = str.c_str();
+ for(; *psz != 0; psz++)
+ {
+ if (*psz == ' ' || *psz == '\t')
+ continue;
+ else
+ {
+ if (*psz != '!')
+ return;
+ else // Found comment line: break for loop and get another line.
+ break;
+ }
+ }
+ }
+}
+
+
+static inline SclFloat CentToRatio(const SclFloat& val)
+//-----------------------------------------------------
+{
+ return pow(2.0, val / 1200.0);
+}
+
+
+CTuningDialog::EnSclImport CTuningDialog::ImportScl(LPCTSTR pszPath, LPCTSTR pszName)
+//-----------------------------------------------------------------------------------
+{
+ CFile file;
+ if (file.Open(pszPath, CFile::modeRead) == 0)
+ return enSclImportFailUnableToOpenFile;
+
+ size_t nSize = static_cast<size_t>(file.GetLength());
+
+ std::vector<char> data(nSize + 1, 0);
+ nSize = file.Read(&data[0], nSize);
+ file.Close();
+
+ std::istrstream iStrm(&data[0], nSize);
+ return ImportScl(iStrm, pszName);
+}
+
+
+CTuningDialog::EnSclImport CTuningDialog::ImportScl(std::istream& iStrm, LPCTSTR pszName)
+//---------------------------------------------------------------------------------------
+{
+ std::string str;
+ SkipCommentLines(iStrm, str);
+ // str should now contain comment line.
+ SkipCommentLines(iStrm, str);
+ // str should now contain number of notes.
+ const size_t nNotes = 1 + ConvertStrTo<size_t>(str.c_str());
+ if (nNotes > s_nSclImportMaxNoteCount)
+ return enSclImportFailTooManyNotes;
+
+ std::vector<CTuningRTI::RATIOTYPE> fRatios;
+ fRatios.reserve(nNotes);
+ fRatios.push_back(1);
+
+ char buffer[128];
+ MemsetZero(buffer);
+
+ while (iStrm.getline(buffer, sizeof(buffer)))
+ {
+ LPSTR psz = buffer;
+ LPSTR const pEnd = psz + strlen(buffer);
+
+ // Skip tabs and spaces.
+ while(psz != pEnd && (*psz == ' ' || *psz == '\t'))
+ psz++;
+
+ // Skip empty lines, comment lines and non-text.
+ if (*psz == 0 || *psz == '!' || *psz < 32)
+ continue;
+
+ char* pNonDigit = pEnd;
+
+ // Check type of first non digit. This tells whether to read cent, ratio or plain number.
+ for (pNonDigit = psz; pNonDigit != pEnd; pNonDigit++)
+ {
+ if (isdigit(*pNonDigit) == 0)
+ break;
+ }
+
+ if (*pNonDigit == '.') // Reading cents
+ {
+ SclFloat fCent = ConvertStrTo<SclFloat>(psz);
+ fRatios.push_back(static_cast<CTuningRTI::RATIOTYPE>(CentToRatio(fCent)));
+ }
+ else if (*pNonDigit == '/') // Reading ratios
+ {
+ *pNonDigit = 0; // Replace '/' with null.
+ int64 nNum = ConvertStrTo<int64>(psz);
+ psz = pNonDigit + 1;
+ int64 nDenom = ConvertStrTo<int64>(psz);
+
+ if (nNum > int32_max || nDenom > int32_max)
+ return enSclImportFailTooLargeNumDenomIntegers;
+ if (nDenom == 0)
+ return enSclImportFailZeroDenominator;
+
+ fRatios.push_back(static_cast<CTuningRTI::RATIOTYPE>((SclFloat)nNum / (SclFloat)nDenom));
+ }
+ else // Plain numbers.
+ fRatios.push_back(static_cast<CTuningRTI::RATIOTYPE>(ConvertStrTo<int32>(psz)));
+ }
+
+ if (nNotes != fRatios.size())
+ return enSclImportLineCountMismatch;
+
+ for(size_t i = 0; i < fRatios.size(); i++)
+ {
+ if (fRatios[i] < 0)
+ return enSclImportFailNegativeRatio;
+ }
+
+ CTuning* pT = new CTuningRTI;
+ if (pT->CreateGroupGeometric(fRatios, 1, pT->GetValidityRange(), 0) != false)
+ {
+ delete pT;
+ return enSclImportTuningCreationFailure;
+ }
+
+ if (m_TempTunings.AddTuning(pT) != false)
+ {
+ delete pT;
+ return enSclImportAddTuningFailure;
+ }
+
+ pT->SetName(pszName);
+
+ return enSclImportOk;
+}
+
+
Modified: trunk/OpenMPT/mptrack/TuningDialog.h
===================================================================
--- trunk/OpenMPT/mptrack/TuningDialog.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/TuningDialog.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -187,6 +187,19 @@
friend class CTuningTreeCtrl;
+ enum EnSclImport
+ {
+ enSclImportOk,
+ enSclImportFailTooLargeNumDenomIntegers,
+ enSclImportFailZeroDenominator,
+ enSclImportFailNegativeRatio,
+ enSclImportFailUnableToOpenFile,
+ enSclImportLineCountMismatch,
+ enSclImportTuningCreationFailure,
+ enSclImportAddTuningFailure,
+ enSclImportFailTooManyNotes
+ };
+
public:
typedef vector<CTuningCollection*> TUNINGVECTOR;
@@ -233,6 +246,10 @@
//Checks whether tuning collection can be deleted.
bool IsDeletable(const CTuningCollection* const pTC) const;
+
+ // Scl-file import.
+ EnSclImport ImportScl(LPCTSTR pszPath, LPCTSTR pszName);
+ EnSclImport ImportScl(std::istream& iStrm, LPCTSTR pszName);
private:
@@ -297,6 +314,8 @@
TT_TUNING
};
+ static CString GetSclImportFailureMsg(EnSclImport);
+ static const size_t s_nSclImportMaxNoteCount = 64;
//To indicate whether to apply changes made to
//those edit boxes(they are modified by certain activities
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -965,10 +965,10 @@
// path info for ITP instruments
BOOL pathOk = pSndFile->m_szInstrumentPath[nIns-1][0] != '\0';
BOOL instOk = pSndFile->instrumentModified[nIns-1] == FALSE;
- wsprintf(s, pathOk ? (instOk ? "%3d: %s" : "%3d: * %s") : "%3d: ? %s", nIns, pSndFile->Instruments[nIns]->name);
+ wsprintf(s, pathOk ? (instOk ? "%3d: %s" : "%3d: * %s") : "%3d: ? %s", nIns, (LPCTSTR)pSndFile->GetInstrumentName(nIns));
} else
{
- wsprintf(s, "%3d: %s", nIns, pSndFile->Instruments[nIns]->name);
+ wsprintf(s, "%3d: %s", nIns, (LPCTSTR)pSndFile->GetInstrumentName(nIns));
}
int nImage = IMAGE_INSTRUMENTS;
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -746,7 +746,7 @@
{
if (pSndFile->m_nInstruments)
{
- wsprintf(s, "%03d:%s", n, (pSndFile->Instruments[n]) ? pSndFile->Instruments[n]->name : "");
+ wsprintf(s, "%03d:%s", n, (pSndFile->Instruments[n]) ? (LPCTSTR)pSndFile->GetInstrumentName(n) : "");
} else
{
wsprintf(s, "%03d:%s", n, pSndFile->m_szNames[n]);
@@ -2876,7 +2876,7 @@
}
if (bUsed) {
CString sampleName;
- sampleName.Format("%d: %s", i, (LPCTSTR)m_pSndFile->GetSampleName(i));
+ sampleName.Format("%d: %s", i, m_pSndFile->GetSampleName(i));
nInsertPos = m_CbnSample.AddString(sampleName);
m_CbnSample.SetItemData(nInsertPos, i);
Modified: trunk/OpenMPT/mptrack/misc_util.cpp
===================================================================
--- trunk/OpenMPT/mptrack/misc_util.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/misc_util.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -29,3 +29,25 @@
return pData;
}
+
+// Returns error message corresponding to error code returned by GetLastError().
+CString GetErrorMessage(DWORD nErrorCode)
+//---------------------------------------
+{
+ const size_t nBufferSize = 256;
+ CString sMsg;
+ LPTSTR pszBuf = sMsg.GetBuffer(nBufferSize);
+
+ FormatMessage( FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,
+ nErrorCode,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ pszBuf,
+ nBufferSize,
+ NULL );
+
+ sMsg.ReleaseBuffer();
+
+ return sMsg;
+}
+
Modified: trunk/OpenMPT/mptrack/misc_util.h
===================================================================
--- trunk/OpenMPT/mptrack/misc_util.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/misc_util.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -17,23 +17,19 @@
//Convert string to number.
template<class T>
-inline T ConvertStrTo(const char* str)
-//----------------------------------
+inline T ConvertStrTo(LPCSTR psz)
+//-------------------------------
{
- //Is implemented like this because the commented code below caused link errors.
if(std::numeric_limits<T>::is_integer)
- return static_cast<T>(atoi(str));
+ return static_cast<T>(atoi(psz));
else
- return static_cast<T>(atof(str));
-
- /*
- std::istringstream i(str);
- T t;
- i >> t;
- return t;
- */
+ return static_cast<T>(atof(psz));
}
+template<> inline uint32 ConvertStrTo(LPCSTR psz) {return strtoul(psz, nullptr, 10);}
+template<> inline int64 ConvertStrTo(LPCSTR psz) {return _strtoi64(psz, nullptr, 10);}
+template<> inline uint64 ConvertStrTo(LPCSTR psz) {return _strtoui64(psz, nullptr, 10);}
+
// Sets last character to null in given char array.
// Size of the array must be known at compile time.
template <size_t size>
@@ -45,6 +41,11 @@
}
+// Memset given object to zero.
+template <class T>
+inline void MemsetZero(T& a) {memset(&a, 0, sizeof(T));}
+
+
// Limits 'val' to given range. If 'val' is less than 'lowerLimit', 'val' is set to value 'lowerLimit'.
// Similarly if 'val' is greater than 'upperLimit', 'val' is set to value 'upperLimit'.
// If 'lowerLimit' > 'upperLimit', 'val' won't be modified.
@@ -75,6 +76,7 @@
LPCCH LoadResource(LPCTSTR lpName, LPCTSTR lpType, LPCCH& pData, size_t& nSize, HGLOBAL& hglob);
+CString GetErrorMessage(DWORD nErrorCode);
namespace utilImpl
{
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2010-01-07 17:10:05 UTC (rev 456)
@@ -13,7 +13,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Deutsch (Deutschland) resources
+// German (Germany) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
#ifdef _WIN32
@@ -142,12 +142,12 @@
END
#endif // APSTUDIO_INVOKED
-#endif // Deutsch (Deutschland) resources
+#endif // German (Germany) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Englisch (USA) resources
+// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
#ifdef _WIN32
@@ -162,7 +162,7 @@
IDD_ABOUTBOX DIALOGEX 0, 0, 267, 254
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "About ModPlug Tracker"
+CAPTION "About OpenMPT"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
CONTROL "",IDC_BITMAP1,"Static",SS_BLACKRECT | SS_NOTIFY | SS_CENTERIMAGE,5,3,256,81,WS_EX_CLIENTEDGE
@@ -1966,7 +1966,7 @@
STRINGTABLE
BEGIN
- AFX_IDS_APP_TITLE "Modplug Tracker"
+ AFX_IDS_APP_TITLE "OpenMPT"
AFX_IDS_IDLEMESSAGE "Ready"
END
@@ -2012,8 +2012,8 @@
STRINGTABLE
BEGIN
- ID_APP_ABOUT "About ModPlug Tracker\nAbout"
- ID_APP_EXIT "Exit ModPlug Tracker\nExit"
+ ID_APP_ABOUT "About OpenMPT\nAbout"
+ ID_APP_EXIT "Exit OpenMPT\nExit"
ID_HELP_INDEX "Opens Help\nHelp Topics"
ID_HELP_FINDER "List Help topics\nHelp Topics"
ID_HELP_USING "Display instructions about how to use help\nHelp"
@@ -2286,14 +2286,36 @@
IDS_CONFIRM_SEQUENCE_DELETE "Delete sequence %1?"
IDS_PATTERN_CLEANUP_UNAVAILABLE
"Removing unused patterns is not available when using multiple sequences."
+ IDS_SCL_IMPORT_FAIL_1 "Invalid numerator or denominator"
+ IDS_SCL_IMPORT_FAIL_2 "Zero denominator"
+ IDS_SCL_IMPORT_FAIL_3 "Negative ratio"
+ IDS_SCL_IMPORT_FAIL_4 "Unable to open file"
+ IDS_SCL_IMPORT_FAIL_5 "Note count error"
+ IDS_SCL_IMPORT_FAIL_6 "Unknown tuning creation error"
+ IDS_SCL_IMPORT_FAIL_7 "Can't add tuning to tuning collection"
+ IDS_SCL_IMPORT_FAIL_8 "OpenMPT supports importing scl-files with at most %1 notes"
END
-#endif // Englisch (USA) resources
+STRINGTABLE
+BEGIN
+ IDS_TUNING_IMPORT_LIMIT "-Failed to load file %1%2: maximum number(=%3!u!) of temporary tunings is already open.\n"
+ IDS_TUNING_IMPORT_UNKNOWN_FAILURE
+ "-Unable to import file ""%1%2"": unknown reason.\n"
+ IDS_TUNING_IMPORT_UNRECOGNIZED_FILE_EXT
+ "-Unable to load ""%1%2"": unrecognized file extension.\n"
+ IDS_TUNING_IMPORT_UNKNOWN_TC_FAILURE
+ "-Unable to import tuning collection ""%1%2"": unrecognized file.\n"
+ IDS_TUNING_IMPORT_SCL_FAILURE "-Unable to import ""%1%2"": %3.\n"
+ IDS_TUNING_IMPORT_UNRECOGNIZED_FILE
+ "-Unable to import file ""%1%2"": unrecognized file.\n"
+END
+
+#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// Englisch (GB) resources
+// English (U.K.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
#ifdef _WIN32
@@ -2662,7 +2684,7 @@
//
IDR_BUILTIN_TUNINGS TUNING "res\\built-inTunings.tc"
-#endif // Englisch (GB) resources
+#endif // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/resource.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -52,6 +52,20 @@
#define IDS_CANT_OPEN_FILE_FOR_WRITING 213
#define IDS_CONFIRM_SEQUENCE_DELETE 214
#define IDS_PATTERN_CLEANUP_UNAVAILABLE 215
+#define IDS_SCL_IMPORT_FAIL_1 216
+#define IDS_SCL_IMPORT_FAIL_2 217
+#define IDS_SCL_IMPORT_FAIL_3 218
+#define IDS_SCL_IMPORT_FAIL_4 219
+#define IDS_SCL_IMPORT_FAIL_5 220
+#define IDS_SCL_IMPORT_FAIL_6 221
+#define IDS_SCL_IMPORT_FAIL_7 222
+#define IDS_SCL_IMPORT_FAIL_8 223
+#define IDS_TUNING_IMPORT_LIMIT 224
+#define IDS_TUNING_IMPORT_UNKNOWN_FAILURE 225
+#define IDS_TUNING_IMPORT_UNRECOGNIZED_FILE_EXT 226
+#define IDS_TUNING_IMPORT_UNKNOWN_TC_FAILURE 227
+#define IDS_TUNING_IMPORT_SCL_FAILURE 228
+#define IDS_TUNING_IMPORT_UNRECOGNIZED_FILE 229
#define IDB_MAINBAR 300
#define IDB_IMAGELIST 301
#define IDB_PATTERNS 302
@@ -579,9 +593,7 @@
#define IDC_SPIN_SPACING 2032
#define IDC_EDIT_SPACING 2033
#define IDC_SAMPLE_NAME 2034
-#define IDC_EDIT_SEQNUM 2034
#define IDC_SAMPLE_FILENAME 2035
-#define IDC_SPIN_SEQNUM 2035
#define IDC_SAMPLE_NEW 2036
#define IDC_SAMPLE_OPEN 2037
#define IDC_SAMPLE_SAVEAS 2038
@@ -604,6 +616,8 @@
#define IDC_SAMPLE_SILENCE 2054
#define IDC_SAMPLE_INVERT 2055
#define IDC_SAMPLE_SIGN_UNSIGN 2056
+#define IDC_EDIT_SEQNUM 2057
+#define IDC_SPIN_SEQNUM 2058
#define IDC_INSTRUMENT_NEW 2060
#define IDC_INSTRUMENT_OPEN 2061
#define IDC_INSTRUMENT_SAVEAS 2062
Modified: trunk/OpenMPT/mptrack/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/mptrack/test/test.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -65,6 +65,7 @@
void TestVersion();
void TestTypes();
void TestPCnoteSerialization();
+void TestMisc();
@@ -75,6 +76,7 @@
DO_TEST(TestVersion);
DO_TEST(TestTypes);
//DO_TEST(TestPCnoteSerialization);
+ DO_TEST(TestMisc);
Log(TEXT("Tests were run\n"));
}
@@ -169,6 +171,27 @@
}
+void TestMisc()
+//-------------
+{
+ VERIFY_EQUAL(ConvertStrTo<uint32>("586"), 586);
+ VERIFY_EQUAL(ConvertStrTo<uint32>("2147483647"), int32_max);
+ VERIFY_EQUAL(ConvertStrTo<uint32>("4294967295"), uint32_max);
+
+ VERIFY_EQUAL(ConvertStrTo<int64>("-9223372036854775808"), int64_min);
+ VERIFY_EQUAL(ConvertStrTo<int64>("-159"), -159);
+ VERIFY_EQUAL(ConvertStrTo<int64>("9223372036854775807"), int64_max);
+
+ VERIFY_EQUAL(ConvertStrTo<uint64>("85059"), 85059);
+ VERIFY_EQUAL(ConvertStrTo<uint64>("9223372036854775807"), int64_max);
+ VERIFY_EQUAL(ConvertStrTo<uint64>("18446744073709551615"), uint64_max);
+
+ VERIFY_EQUAL(ConvertStrTo<float>("-87.0"), -87.0);
+ VERIFY_EQUAL(ConvertStrTo<double>("-0.5e-6"), -0.5e-6);
+ VERIFY_EQUAL(ConvertStrTo<double>("58.65403492763"), 58.65403492763);
+}
+
+
template<class T>
T Round(double a) {return static_cast<T>(floor(a + 0.5));}
Modified: trunk/OpenMPT/packageTemplate/SoundTouch/README.html
===================================================================
--- trunk/OpenMPT/packageTemplate/SoundTouch/README.html 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/packageTemplate/SoundTouch/README.html 2010-01-07 17:10:05 UTC (rev 456)
@@ -12,9 +12,9 @@
<hr>
<font color=red><h5>Note: This readme is shortened version of the original
SoundTouch readme providing documentation for the time stretching feature.<br>
-SoundTouch WWW page: http://www.surina.net/soundtouch
+SoundTouch WWW page: <a href="http://www.surina.net/soundtouch">www.surina.net/soundtouch</a>
</h5></font>
-<h1>SoundTouch audio processing library v1.4.0
+<h1>SoundTouch audio processing library v1.5.0
</h1>
<p class="normal">SoundTouch library Copyright (c) Olli
Parviainen 2002-2009 </p>
@@ -40,11 +40,11 @@
sound the default parameter set may result into a sub-optimal
result.</p>
<p>The time-stretch algorithm default
-parameter values are set by these #defines in file "TDStretch.h":</p>
+parameter values are set by the following #defines in file "TDStretch.h":</p>
<blockquote>
<pre>#define DEFAULT_SEQUENCE_MS AUTOMATIC
#define DEFAULT_SEEKWINDOW_MS AUTOMATIC
-#define DEFAULT_OVERLAP_MS 12</pre>
+#define DEFAULT_OVERLAP_MS 8</pre>
</blockquote>
<p>These parameters affect to the time-stretch
algorithm as follows:</p>
@@ -148,6 +148,37 @@
<h2>5. Change History</h2>
<h3>5.1. SoundTouch library Change History </h3>
+<p><strong>1.5.0:</strong></p>
+<ul>
+<li>Added normalization to correlation calculation and improvement automatic seek/sequence parameter calculation to improve sound quality</li>
+
+<li>Bugfixes:
+ <ul>
+ <li>Fixed negative array indexing in quick seek algorithm</li>
+ <li>FIR autoalias filter running too far in processing buffer</li>
+ <li>Check against zero sample count in rate transposing</li>
+ <li>Fix for x86-64 support: Removed pop/push instructions from the cpu detection algorithm. </li>
+ <li>Check against empty buffers in FIFOSampleBuffer</li>
+ <li>Other minor fixes & code cleanup</li>
+ </ul>
+</li>
+
+<li>Fixes in compilation scripts for non-Intel platforms</li>
+<li>Added Dynamic-Link-Library (DLL) version of SoundTouch library build,
+ provided with Delphi/Pascal wrapper for calling the dll routines</li>
+<li>Added #define PREVENT_CLICK_AT_RATE_CROSSOVER that prevents a click artifact
+ when crossing the nominal pitch from either positive to negative side or vice
+ versa</li>
+
+</ul>
+
+<p><strong>1.4.1:</strong></p>
+<ul>
+<li>Fixed a buffer overflow bug in BPM detect algorithm routines if processing
+ more than 2048 samples at one call </li>
+
+</ul>
+
<p><strong>1.4.0:</strong></p>
<ul>
<li>Improved sound quality by automatic calculation of time stretch algorithm
@@ -237,25 +268,32 @@
<p> </p>
<hr>
<h2 >6. Acknowledgements </h2>
-<p >Kudos for these people who have submitted bugfixed since
+<p >Kudos for these people who have contributed to development or submitted
+bugfixes since
SoundTouch v1.3.1: </p>
<ul>
<li>Arthur A</li>
<li>Richard Ash</li>
<li>Stanislav Brabec</li>
+ <li>Christian Budde</li>
<li>Brian Cameron</li>
+ <li>Jason Champion</li>
+ <li>Patrick Colis</li>
<li>Justin Frankel</li>
<li>Jason Garland</li>
<li>Takashi Iwai</li>
+ <li>Paulo Pizarro</li>
+ <li>RJ Ryan</li>
+ <li>John Sheehy</li>
</ul>
-<p >Moral greetings to all other contributors as well!</p>
+<p >Moral greetings to all other contributors and users also!</p>
<hr>
<h2 >7. LICENSE </h2>
<p>SoundTouch audio processing library<br>
Copyright (c) Olli Parviainen</p>
<p>This library is free software; you can
redistribute it and/or modify it under the terms of the GNU
-Lesser General Public License vesrion 2.1 as published by the Free Software
+Lesser General Public License version 2.1 as published by the Free Software
Foundation.</p>
<p>This library is distributed in the hope
that it will be useful, but WITHOUT ANY WARRANTY; without even
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -1404,13 +1404,13 @@
}
-CString CSoundFile::GetSampleName(UINT nSample) const
-//--------------------------------------------------------
+LPCTSTR CSoundFile::GetSampleName(UINT nSample) const
+//---------------------------------------------------
{
if (nSample<MAX_SAMPLES) {
return m_szNames[nSample];
} else {
- return "";
+ return gszEmpty;
}
}
@@ -2875,7 +2875,9 @@
}
// Load local tunings.
- s_pTuningsSharedLocal->SetSavefilePath(std::string(std::string(theApp.GetTuningsPath()) + "local_tunings" + CTuningCollection::s_FileExtension.c_str()));
+ CString sPath;
+ sPath.Format(TEXT("%slocal_tunings%s"), CMainFrame::GetDefaultDirectory(DIR_TUNING), CTuningCollection::s_FileExtension);
+ s_pTuningsSharedLocal->SetSavefilePath(sPath);
s_pTuningsSharedLocal->Deserialize();
// Enabling adding/removing of tunings for standard collection
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -116,7 +116,7 @@
signed char nPPS; //Pitch to Pan Separator?
unsigned char nPPC; //Pitch Centre?
- CHAR name[32];
+ CHAR name[32]; // Note: not guaranteed to be null-terminated.
CHAR filename[32];
BYTE nMixPlug; //rewbs.instroVSTi
@@ -651,7 +651,7 @@
void SetCurrentOrder(ORDERINDEX nOrder);
void GetTitle(LPSTR s) const { lstrcpyn(s,m_szNames[0],32); }
LPCSTR GetTitle() const { return m_szNames[0]; }
- CString GetSampleName(UINT nSample) const;
+ LPCTSTR GetSampleName(UINT nSample) const;
CString GetInstrumentName(UINT nInstr) const;
UINT GetMusicSpeed() const { return m_nMusicSpeed; }
UINT GetMusicTempo() const { return m_nMusicTempo; }
Modified: trunk/OpenMPT/soundlib/mod_specifications.h
===================================================================
--- trunk/OpenMPT/soundlib/mod_specifications.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundlib/mod_specifications.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -146,7 +146,7 @@
0, //No instrument envelopes
" 0123456789ABCD?FF?E???????????????", // Supported Effects
" ???????????????", // Supported Volume Column commands
- false, // Doesn't have "+++" pattern
+ true, // Has "+++" pattern
};
const CModSpecifications xm =
@@ -209,7 +209,7 @@
12, //Envelope point count
" 0123456789ABCDRFFTE???GHK?YXPLZ\\:#", // Supported Effects
" vpcdabuhlrgfe:o", // Supported Volume Column commands
- false, // Doesn't have "+++" pattern
+ true, // Has "+++" pattern
};
const CModSpecifications s3m =
Modified: trunk/OpenMPT/soundlib/tuningCollection.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuningCollection.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundlib/tuningCollection.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -18,7 +18,7 @@
using namespace std;
-const string CTuningCollection::s_FileExtension = ".tc";
+const TCHAR CTuningCollection::s_FileExtension[4] = TEXT(".tc");
namespace CTuningS11n
{
@@ -277,7 +277,7 @@
bool CTuningCollection::AddTuning(CTuning* const pT)
//--------------------------------------------------
{
- if((m_EditMask & EM_ADD) == 0 || m_Tunings.size() >= 255)
+ if((m_EditMask & EM_ADD) == 0 || m_Tunings.size() >= s_nMaxTuningCount)
return true;
if(pT == NULL)
@@ -292,7 +292,7 @@
bool CTuningCollection::AddTuning(istream& inStrm, const bool ignoreEditmask)
//-------------------------------------------------
{
- if(!ignoreEditmask && (m_EditMask & EM_ADD) == 0 || m_Tunings.size() >= 255)
+ if(!ignoreEditmask && (m_EditMask & EM_ADD) == 0 || m_Tunings.size() >= s_nMaxTuningCount)
return true;
if(!inStrm.good()) return true;
Modified: trunk/OpenMPT/soundlib/tuningbase.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuningbase.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundlib/tuningbase.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -44,7 +44,7 @@
const TYPENAME CTUNINGBASE::SERIALIZATION_RETURN_TYPE CTUNINGBASE::SERIALIZATION_FAILURE = true;
TEMPLATEDEC
-const string CTUNINGBASE::s_FileExtension = ".tun";
+const TCHAR CTUNINGBASE::s_FileExtension[5] = TEXT(".tun");
TEMPLATEDEC
const TYPENAME CTUNINGBASE::EDITMASK CTUNINGBASE::EM_RATIOS = 1; //1b
@@ -290,8 +290,8 @@
if(MayEdit(EM_RATIOS) &&
(MayEdit(EM_TYPE) || GetType() == TT_GROUPGEOMETRIC))
{
- if(vr.first > vr.second) return true;
- if(ratiostartpos < vr.first || vr.second < ratiostartpos || static_cast<UNOTEINDEXTYPE>(vr.second - ratiostartpos) < static_cast<UNOTEINDEXTYPE>(v.size())) return true;
+ if(vr.first > vr.second || v.size() == 0) return true;
+ if(ratiostartpos < vr.first || vr.second < ratiostartpos || static_cast<UNOTEINDEXTYPE>(vr.second - ratiostartpos) < static_cast<UNOTEINDEXTYPE>(v.size() - 1)) return true;
if(!IsStepCountRangeSufficient(GetFineStepCount(), vr)) return true;
for(size_t i = 0; i<v.size(); i++) {if(v[i] < 0) return true;}
if(ProCreateGroupGeometric(v,r, vr, ratiostartpos))
Modified: trunk/OpenMPT/soundlib/tuningbase.h
===================================================================
--- trunk/OpenMPT/soundlib/tuningbase.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundlib/tuningbase.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -95,7 +95,7 @@
static const SERIALIZATION_RETURN_TYPE SERIALIZATION_SUCCESS;
static const SERIALIZATION_RETURN_TYPE SERIALIZATION_FAILURE;
- static const string s_FileExtension;
+ static const TCHAR s_FileExtension[5];
static const EDITMASK EM_RATIOS;
static const EDITMASK EM_NOTENAME;
Modified: trunk/OpenMPT/soundlib/tuningcollection.h
===================================================================
--- trunk/OpenMPT/soundlib/tuningcollection.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundlib/tuningcollection.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -50,7 +50,8 @@
SERIALIZATION_FAILURE = true
};
- static const string s_FileExtension;
+ static const TCHAR s_FileExtension[4];
+ static const size_t s_nMaxTuningCount = 255;
//END PUBLIC STATIC CONSTS
@@ -84,7 +85,7 @@
const string& GetName() const {return m_Name;}
- void SetSavefilePath(const string& str) {m_SavefilePath = str;}
+ void SetSavefilePath(LPCTSTR psz) {m_SavefilePath = psz;}
const string& GetSaveFilePath() const {return m_SavefilePath;}
string GetVersionString() const {return Stringify(s_SerializationVersion);}
Modified: trunk/OpenMPT/soundtouch/3dnow_win.cpp
===================================================================
--- trunk/OpenMPT/soundtouch/3dnow_win.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundtouch/3dnow_win.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -35,10 +35,10 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2009-01-25 16:13:39 +0200 (Sun, 25 Jan 2009) $
+// Last changed : $Date: 2009-02-21 18:00:14 +0200 (Sat, 21 Feb 2009) $
// File revision : $Revision: 4 $
//
-// $Id: 3dnow_win.cpp 51 2009-01-25 14:13:39Z oparviai $
+// $Id: 3dnow_win.cpp 63 2009-02-21 16:00:14Z oparviai $
//
////////////////////////////////////////////////////////////////////////////////
//
@@ -82,17 +82,13 @@
//////////////////////////////////////////////////////////////////////////////
#include "TDStretch.h"
-//#include <limits.h>
-// these are declared in 'TDStretch.cpp'
-// extern int scanOffsets[4][24];
-
// Calculates cross correlation of two buffers
double TDStretch3DNow::calcCrossCorrStereo(const float *pV1, const float *pV2) const
{
- uint overlapLengthLocal = overlapLength;
- float corr;
+ int overlapLengthLocal = overlapLength;
+ float corr = 0;
// Calculates the cross-correlation value between 'pV1' and 'pV2' vectors
/*
Modified: trunk/OpenMPT/soundtouch/BPMDetect.cpp
===================================================================
--- trunk/OpenMPT/soundtouch/BPMDetect.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundtouch/BPMDetect.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -26,10 +26,10 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2008-12-25 19:54:41 +0200 (Thu, 25 Dec 2008) $
+// Last changed : $Date: 2009-02-21 18:00:14 +0200 (Sat, 21 Feb 2009) $
// File revision : $Revision: 4 $
//
-// $Id: BPMDetect.cpp 43 2008-12-25 17:54:41Z oparviai $
+// $Id: BPMDetect.cpp 63 2009-02-21 16:00:14Z oparviai $
//
////////////////////////////////////////////////////////////////////////////////
//
@@ -66,8 +66,6 @@
#define INPUT_BLOCK_SAMPLES 2048
#define DECIMATED_BLOCK_SAMPLES 256
-typedef unsigned short ushort;
-
/// decay constant for calculating RMS volume sliding average approximation
/// (time constant is about 10 sec)
const float avgdecay = 0.99986f;
@@ -77,19 +75,14 @@
-BPMDetect::BPMDetect(int numChannels, int sampleRate)
+BPMDetect::BPMDetect(int numChannels, int aSampleRate)
{
- xcorr = NULL;
+ this->sampleRate = aSampleRate;
+ this->channels = numChannels;
- buffer = new FIFOSampleBuffer();
-
decimateSum = 0;
decimateCount = 0;
- decimateBy = 0;
- this->sampleRate = sampleRate;
- this->channels = numChannels;
-
envelopeAccu = 0;
// Initialize RMS volume accumulator to RMS level of 3000 (out of 32768) that's
@@ -103,7 +96,26 @@
RMSVolumeAccu = (0.092f * 0.092f) / avgnorm;
#endif
- init(numChannels, sampleRate);
+ // choose decimation factor so that result is approx. 500 Hz
+ decimateBy = sampleRate / 500;
+ assert(decimateBy > 0);
+ assert(INPUT_BLOCK_SAMPLES < decimateBy * DECIMATED_BLOCK_SAMPLES);
+
+ // Calculate window length & starting item according to desired min & max bpms
+ windowLen = (60 * sampleRate) / (decimateBy * MIN_BPM);
+ windowStart = (60 * sampleRate) / (decimateBy * MAX_BPM);
+
+ assert(windowLen > windowStart);
+
+ // allocate new working objects
+ xcorr = new float[windowLen];
+ memset(xcorr, 0, windowLen * sizeof(float));
+
+ // allocate processing buffer
+ buffer = new FIFOSampleBuffer();
+ // we do processing in mono mode
+ buffer->setChannels(1);
+ buffer->clear();
}
@@ -115,7 +127,9 @@
}
-/// low-pass filter & decimate to about 500 Hz. return number of outputted samples.
+
+/// convert to mono, low-pass filter & decimate to about 500 Hz.
+/// return number of outputted samples.
///
/// Decimation is used to remove the unnecessary frequencies and thus to reduce
/// the amount of data needed to be processed as calculating autocorrelation
@@ -130,17 +144,25 @@
int count, outcount;
LONG_SAMPLETYPE out;
- assert(decimateBy != 0);
+ assert(channels > 0);
+ assert(decimateBy > 0);
outcount = 0;
for (count = 0; count < numsamples; count ++)
{
- decimateSum += src[count];
+ int j;
+ // convert to mono and accumulate
+ for (j = 0; j < channels; j ++)
+ {
+ decimateSum += src[j];
+ }
+ src += j;
+
decimateCount ++;
if (decimateCount >= decimateBy)
{
// Store every Nth sample only
- out = (LONG_SAMPLETYPE)(decimateSum / decimateBy);
+ out = (LONG_SAMPLETYPE)(decimateSum / (decimateBy * channels));
decimateSum = 0;
decimateCount = 0;
#ifdef INTEGER_SAMPLES
@@ -231,35 +253,35 @@
-void BPMDetect::inputSamples(SAMPLETYPE *samples, int numSamples)
+void BPMDetect::inputSamples(const SAMPLETYPE *samples, int numSamples)
{
SAMPLETYPE decimated[DECIMATED_BLOCK_SAMPLES];
- // convert from stereo to mono if necessary
- if (channels == 2)
+ // iterate so that max INPUT_BLOCK_SAMPLES processed per iteration
+ while (numSamples > 0)
{
- int i;
+ int block;
+ int decSamples;
- for (i = 0; i < numSamples; i ++)
- {
- samples[i] = (samples[i * 2] + samples[i * 2 + 1]) / 2;
- }
- }
-
- // decimate
- numSamples = decimate(decimated, samples, numSamples);
+ block = (numSamples > INPUT_BLOCK_SAMPLES) ? INPUT_BLOCK_SAMPLES : numSamples;
- // envelope new samples and add them to buffer
- calcEnvelope(decimated, numSamples);
- buffer->putSamples(decimated, numSamples);
+ // decimate. note that converts to mono at the same time
+ decSamples = decimate(decimated, samples, block);
+ samples += block * channels;
+ numSamples -= block;
+ // envelope new samples and add them to buffer
+ calcEnvelope(decimated, decSamples);
+ buffer->putSamples(decimated, decSamples);
+ }
+
// when the buffer has enought samples for processing...
if ((int)buffer->numSamples() > windowLen)
{
int processLength;
// how many samples are processed
- processLength = buffer->numSamples() - windowLen;
+ processLength = (int)buffer->numSamples() - windowLen;
// ... calculate autocorrelations for oldest samples...
updateXCorr(processLength);
@@ -269,32 +291,7 @@
}
-void BPMDetect::init(int numChannels, int sampleRate)
-{
- this->sampleRate = sampleRate;
- // choose decimation factor so that result is approx. 500 Hz
- decimateBy = sampleRate / 500;
- assert(decimateBy > 0);
- assert(INPUT_BLOCK_SAMPLES < decimateBy * DECIMATED_BLOCK_SAMPLES);
-
- // Calculate window length & starting item according to desired min & max bpms
- windowLen = (60 * sampleRate) / (decimateBy * MIN_BPM);
- windowStart = (60 * sampleRate) / (decimateBy * MAX_BPM);
-
- assert(windowLen > windowStart);
-
- // allocate new working objects
- xcorr = new float[windowLen];
- memset(xcorr, 0, windowLen * sizeof(float));
-
- // we do processing in mono mode
- buffer->setChannels(1);
- buffer->clear();
-}
-
-
-
float BPMDetect::getBpm()
{
double peakPos;
Modified: trunk/OpenMPT/soundtouch/BPMDetect.h
===================================================================
--- trunk/OpenMPT/soundtouch/BPMDetect.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundtouch/BPMDetect.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -26,10 +26,10 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2008-12-25 14:20:01 +0200 (Thu, 25 Dec 2008) $
+// Last changed : $Date: 2009-02-21 18:00:14 +0200 (Sat, 21 Feb 2009) $
// File revision : $Revision: 4 $
//
-// $Id: BPMDetect.h 33 2008-12-25 12:20:01Z oparviai $
+// $Id: BPMDetect.h 63 2009-02-21 16:00:14Z oparviai $
//
////////////////////////////////////////////////////////////////////////////////
//
@@ -108,9 +108,6 @@
/// FIFO-buffer for decimated processing samples.
soundtouch::FIFOSampleBuffer *buffer;
- /// Initialize the class for processing.
- void init(int numChannels, int sampleRate);
-
/// Updates auto-correlation function for given number of decimated samples that
/// are read from the internal 'buffer' pipe (samples aren't removed from the pipe
/// though).
@@ -146,8 +143,8 @@
/// function.
///
/// Notice that data in 'samples' array can be disrupted in processing.
- void inputSamples(soundtouch::SAMPLETYPE *samples, ///< Pointer to input/working data buffer
- int numSamples ///< Number of samples in buffer
+ void inputSamples(const soundtouch::SAMPLETYPE *samples, ///< Pointer to input/working data buffer
+ int numSamples ///< Number of samples in buffer
);
Modified: trunk/OpenMPT/soundtouch/FIFOSampleBuffer.cpp
===================================================================
--- trunk/OpenMPT/soundtouch/FIFOSampleBuffer.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundtouch/FIFOSampleBuffer.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -15,10 +15,10 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2008-02-10 18:26:55 +0200 (Sun, 10 Feb 2008) $
+// Last changed : $Date: 2009-02-27 19:24:42 +0200 (Fri, 27 Feb 2009) $
// File revision : $Revision: 4 $
//
-// $Id: FIFOSampleBuffer.cpp 11 2008-02-10 16:26:55Z oparviai $
+// $Id: FIFOSampleBuffer.cpp 68 2009-02-27 17:24:42Z oparviai $
//
////////////////////////////////////////////////////////////////////////////////
//
@@ -63,6 +63,7 @@
samplesInBuffer = 0;
bufferPos = 0;
channels = (uint)numChannels;
+ ensureCapacity(32); // allocate initial capacity
}
@@ -151,8 +152,9 @@
// When using this function to output samples, also remember to 'remove' the
// outputted samples from the buffer by calling the
// 'receiveSamples(numSamples)' function
-SAMPLETYPE *FIFOSampleBuffer::ptrBegin() const
+SAMPLETYPE *FIFOSampleBuffer::ptrBegin()
{
+ assert(buffer);
return buffer + bufferPos * channels;
}
@@ -175,8 +177,12 @@
{
throw std::runtime_error("Couldn't allocate memory!\n");
}
+ // Align the buffer to begin at 16byte cache line boundary for optimal performance
temp = (SAMPLETYPE *)(((ulong)tempUnaligned + 15) & (ulong)-16);
- memcpy(temp, ptrBegin(), samplesInBuffer * channels * sizeof(SAMPLETYPE));
+ if (samplesInBuffer)
+ {
+ memcpy(temp, ptrBegin(), samplesInBuffer * channels * sizeof(SAMPLETYPE));
+ }
delete[] bufferUnaligned;
buffer = temp;
bufferUnaligned = tempUnaligned;
Modified: trunk/OpenMPT/soundtouch/FIFOSampleBuffer.h
===================================================================
--- trunk/OpenMPT/soundtouch/FIFOSampleBuffer.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundtouch/FIFOSampleBuffer.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -15,10 +15,10 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2008-02-10 18:26:55 +0200 (Sun, 10 Feb 2008) $
+// Last changed : $Date: 2009-02-21 18:00:14 +0200 (Sat, 21 Feb 2009) $
// File revision : $Revision: 4 $
//
-// $Id: FIFOSampleBuffer.h 11 2008-02-10 16:26:55Z oparviai $
+// $Id: FIFOSampleBuffer.h 63 2009-02-21 16:00:14Z oparviai $
//
////////////////////////////////////////////////////////////////////////////////
//
@@ -107,7 +107,7 @@
/// When using this function to output samples, also remember to 'remove' the
/// output samples from the buffer by calling the
/// 'receiveSamples(numSamples)' function
- virtual SAMPLETYPE *ptrBegin() const;
+ virtual SAMPLETYPE *ptrBegin();
/// Returns a pointer to the end of the used part of the sample buffer (i.e.
/// where the new samples are to be inserted). This function may be used for
Modified: trunk/OpenMPT/soundtouch/FIFOSamplePipe.h
===================================================================
--- trunk/OpenMPT/soundtouch/FIFOSamplePipe.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundtouch/FIFOSamplePipe.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -65,6 +65,10 @@
class SOUNDTOUCH_DLLEXPORT FIFOSamplePipe
{
public:
+ // virtual default destructor
+ virtual ~FIFOSamplePipe() {}
+
+
/// Returns a pointer to the beginning of the output samples.
/// This function is provided for accessing the output samples directly.
/// Please be careful for not to corrupt the book-keeping!
@@ -72,7 +76,7 @@
/// When using this function to output samples, also remember to 'remove' the
/// output samples from the buffer by calling the
/// 'receiveSamples(numSamples)' function
- virtual SAMPLETYPE *ptrBegin() const = 0;
+ virtual SAMPLETYPE *ptrBegin() = 0;
/// Adds 'numSamples' pcs of samples from the 'samples' memory position to
/// the sample buffer.
@@ -173,7 +177,7 @@
/// When using this function to output samples, also remember to 'remove' the
/// output samples from the buffer by calling the
/// 'receiveSamples(numSamples)' function
- virtual SAMPLETYPE *ptrBegin() const
+ virtual SAMPLETYPE *ptrBegin()
{
return output->ptrBegin();
}
Modified: trunk/OpenMPT/soundtouch/FIRFilter.cpp
===================================================================
--- trunk/OpenMPT/soundtouch/FIRFilter.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundtouch/FIRFilter.cpp 2010-01-07 17:10:05 UTC (rev 456)
@@ -1,12 +1,3 @@
-/***********************************************
- *
- * ------------- NOTE -------------
- *
- * This file is modified version of the original SoundTouch file.
- * Search for "OpenMPT_change" to see the modifications.
- *
-*/
-
////////////////////////////////////////////////////////////////////////////////
///
/// General FIR digital filter routines with MMX optimization.
@@ -20,7 +11,11 @@
///
////////////////////////////////////////////////////////////////////////////////
//
+// Last changed : $Date: 2009-02-25 19:13:51 +0200 (Wed, 25 Feb 2009) $
+// File revision : $Revision: 4 $
//
+// $Id: FIRFilter.cpp 67 2009-02-25 17:13:51Z oparviai $
+//
////////////////////////////////////////////////////////////////////////////////
//
// License :
@@ -186,10 +181,7 @@
assert(length == newLength);
resultDivFactor = uResultDivFactor;
- //OpenMPT_change-->
- //resultDivider = (SAMPLETYPE)::pow(2, resultDivFactor);
- resultDivider = (1 << resultDivFactor); // == 2^resultDivFactor
- //<--
+ resultDivider = (SAMPLETYPE)::pow(2.0, (int)resultDivFactor);
delete[] filterCoeffs;
filterCoeffs = new SAMPLETYPE[length];
Modified: trunk/OpenMPT/soundtouch/FIRFilter.h
===================================================================
--- trunk/OpenMPT/soundtouch/FIRFilter.h 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundtouch/FIRFilter.h 2010-01-07 17:10:05 UTC (rev 456)
@@ -11,10 +11,10 @@
///
////////////////////////////////////////////////////////////////////////////////
//
-// Last changed : $Date: 2008-02-10 18:26:55 +0200 (Sun, 10 Feb 2008) $
+// Last changed : $Date: 2009-02-21 18:00:14 +0200 (Sat, 21 Feb 2009) $
// File revision : $Revision: 4 $
//
-// $Id: FIRFilter.h 11 2008-02-10 16:26:55Z oparviai $
+// $Id: FIRFilter.h 63 2009-02-21 16:00:14Z oparviai $
//
////////////////////////////////////////////////////////////////////////////////
//
@@ -42,6 +42,7 @@
#ifndef FIRFilter_H
#define FIRFilter_H
+#include <stddef.h>
#include "STTypes.h"
namespace soundtouch
@@ -103,7 +104,7 @@
#ifdef ALLOW_MMX
- /// Class that implements MMX optimized functions exclusive for 16bit integer samples type.
+/// Class that implements MMX optimized functions exclusive for 16bit integer samples type.
class FIRFilterMMX : public FIRFilter
{
protected:
Modified: trunk/OpenMPT/soundtouch/PeakFinder.cpp
===================================================================
--- trunk/OpenMPT/soundtouch/PeakFinder.cpp 2010-01-04 20:01:28 UTC (rev 455)
+++ trunk/OpenMPT/soundtouch/PeakFinder.cpp 2010-01-07 17:10:05 UTC (r...
[truncated message content] |
|
From: <sag...@us...> - 2010-01-04 20:01:38
|
Revision: 455
http://modplug.svn.sourceforge.net/modplug/?rev=455&view=rev
Author: saga-games
Date: 2010-01-04 20:01:28 +0000 (Mon, 04 Jan 2010)
Log Message:
-----------
[Imp] Envelope Editor: Mark currently envelope node yellow for better visibility
[Fix] Envelope Editor: Not all keyboard actions marked the document as modified.
[Imp] Pattern Editor: Added sequence selection edit control
[Imp] Treeview: Don't show "switch to sequence" context menu item for current sequence
[Mod] Updated keymaps DE_Jojo.mkb and FR_mpt_laptop_(legovitch).mkb
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/Ctrl_pat.h
trunk/OpenMPT/mptrack/MainFrm.cpp
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/mptrack/View_ins.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/Vstplug.cpp
trunk/OpenMPT/mptrack/mptrack.rc
trunk/OpenMPT/mptrack/resource.h
trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb
trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_laptop_(legovitch).mkb
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2010-01-04 20:01:28 UTC (rev 455)
@@ -57,6 +57,7 @@
ON_EN_CHANGE(IDC_EDIT_SPACING, OnSpacingChanged)
ON_EN_CHANGE(IDC_EDIT_PATTERNNAME, OnPatternNameChanged)
ON_EN_CHANGE(IDC_EDIT_SEQUENCE_NAME, OnSequenceNameChanged)
+ ON_EN_CHANGE(IDC_EDIT_SEQNUM, OnSequenceNumChanged)
ON_EN_KILLFOCUS(IDC_EDIT_ORDERLIST_MARGINS, OnOrderListMarginsChanged)
ON_UPDATE_COMMAND_UI(IDC_PATTERN_RECORD,OnUpdateRecord)
ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
@@ -75,9 +76,11 @@
DDX_Control(pDX, IDC_EDIT_SPACING, m_EditSpacing);
DDX_Control(pDX, IDC_EDIT_ORDERLIST_MARGINS,m_EditOrderListMargins);
DDX_Control(pDX, IDC_EDIT_PATTERNNAME, m_EditPatName);
+ DDX_Control(pDX, IDC_EDIT_SEQNUM, m_EditSequence);
DDX_Control(pDX, IDC_SPIN_SPACING, m_SpinSpacing);
DDX_Control(pDX, IDC_SPIN_ORDERLIST_MARGINS,m_SpinOrderListMargins);
DDX_Control(pDX, IDC_SPIN_INSTRUMENT, m_SpinInstrument);
+ DDX_Control(pDX, IDC_SPIN_SEQNUM, m_SpinSequence);
DDX_Control(pDX, IDC_TOOLBAR1, m_ToolBar);
//}}AFX_DATA_MAP
}
@@ -143,6 +146,7 @@
m_ToolBar.AddButton(ID_OVERFLOWPASTE, TIMAGE_PATTERN_OVERFLOWPASTE, TBSTYLE_CHECK, ((CMainFrame::m_dwPatternSetup & PATTERN_OVERFLOWPASTE) ? TBSTATE_CHECKED : 0) | TBSTATE_ENABLED);
// Special edit controls -> tab switch to view
+ m_EditSequence.SetParent(this);
m_EditSpacing.SetParent(this);
m_EditPatName.SetParent(this);
m_EditPatName.SetLimitText(MAX_PATTERNNAME);
@@ -171,7 +175,11 @@
SetDlgItemInt(IDC_EDIT_SPACING, CMainFrame::gnPatternSpacing);
SetDlgItemInt(IDC_EDIT_ORDERLIST_MARGINS, m_OrderList.GetMargins());
CheckDlgButton(IDC_PATTERN_FOLLOWSONG, !(CMainFrame::m_dwPatternSetup & PATTERN_FOLLOWSONGOFF)); //rewbs.noFollow - set to unchecked
+
+ m_SpinSequence.SetRange(0, m_pSndFile->Order.GetNumSequences() - 1);
+ m_SpinSequence.SetPos(m_pSndFile->Order.GetCurrentSequenceIndex());
SetDlgItemText(IDC_EDIT_SEQUENCE_NAME, m_pSndFile->Order.m_sName);
+
m_OrderList.SetFocus();
UpdateView(HINT_MODTYPE|HINT_PATNAMES, NULL);
@@ -221,7 +229,14 @@
if (!m_pSndFile) return;
if (dwHintMask & HINT_MODSEQUENCE)
+ {
SetDlgItemText(IDC_EDIT_SEQUENCE_NAME, m_pSndFile->Order.m_sName);
+ }
+ if (dwHintMask & (HINT_MODSEQUENCE|HINT_MODTYPE))
+ {
+ m_SpinSequence.SetRange(0, m_pSndFile->Order.GetNumSequences() - 1);
+ m_SpinSequence.SetPos(m_pSndFile->Order.GetCurrentSequenceIndex());
+ }
//rewbs.instroVST
if (dwHintMask & (HINT_MIXPLUGINS|HINT_MODTYPE))
@@ -234,6 +249,8 @@
// Enable/disable multisequence controls according the current modtype.
GetDlgItem(IDC_STATIC_SEQUENCE_NAME)->EnableWindow( (m_pSndFile->GetType() == MOD_TYPE_MPT) ? SW_SHOW : SW_HIDE);
GetDlgItem(IDC_EDIT_SEQUENCE_NAME)->EnableWindow( (m_pSndFile->GetType() == MOD_TYPE_MPT) ? SW_SHOW : SW_HIDE);
+ GetDlgItem(IDC_EDIT_SEQNUM)->EnableWindow( (m_pSndFile->GetType() == MOD_TYPE_MPT) ? SW_SHOW : SW_HIDE);
+ GetDlgItem(IDC_SPIN_SEQNUM)->EnableWindow( (m_pSndFile->GetType() == MOD_TYPE_MPT) ? SW_SHOW : SW_HIDE);
// Enable/disable pattern names
GetDlgItem(IDC_STATIC_PATTERNNAME)->EnableWindow( (m_pSndFile->GetType() & (MOD_TYPE_MPT|MOD_TYPE_IT|MOD_TYPE_XM)) ? SW_SHOW : SW_HIDE);
@@ -1221,3 +1238,18 @@
return FALSE;
}
+void CCtrlPatterns::OnSequenceNumChanged()
+//----------------------------------------
+{
+ if ((m_EditSequence.m_hWnd) && (m_EditSequence.GetWindowTextLength() > 0))
+ {
+ SEQUENCEINDEX newSeq = (SEQUENCEINDEX)GetDlgItemInt(IDC_EDIT_SEQNUM);
+
+ if (newSeq >= MAX_SEQUENCES)
+ {
+ newSeq = MAX_SEQUENCES - 1;
+ SetDlgItemInt(IDC_EDIT_SEQNUM, MAX_SEQUENCES - 1, FALSE);
+ }
+ m_OrderList.SelectSequence(newSeq);
+ }
+}
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.h
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.h 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.h 2010-01-04 20:01:28 UTC (rev 455)
@@ -161,8 +161,8 @@
COrderList m_OrderList;
CButton m_BtnPrev, m_BtnNext;
CComboBox m_CbnInstrument;
- CPatEdit m_EditSpacing, m_EditPatName, m_EditOrderListMargins;
- CSpinButtonCtrl m_SpinInstrument, m_SpinSpacing, m_SpinOrderListMargins;
+ CPatEdit m_EditSpacing, m_EditPatName, m_EditOrderListMargins, m_EditSequence;
+ CSpinButtonCtrl m_SpinInstrument, m_SpinSpacing, m_SpinOrderListMargins, m_SpinSequence;
CModControlBar m_ToolBar;
INSTRUMENTINDEX m_nInstrument;
UINT m_nDetailLevel;
@@ -233,6 +233,7 @@
afx_msg void OnUpdateRecord(CCmdUI *pCmdUI);
afx_msg void TogglePluginEditor(); //rewbs.instroVST
afx_msg void OnToggleOverflowPaste();
+ afx_msg void OnSequenceNumChanged();
afx_msg LRESULT OnCustomKeyMsg(WPARAM, LPARAM);
//}}AFX_MSG
Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp 2010-01-04 20:01:28 UTC (rev 455)
@@ -237,6 +237,7 @@
HBRUSH CMainFrame::brushHighLight = NULL;
HBRUSH CMainFrame::brushHighLightRed = NULL;
HBRUSH CMainFrame::brushWindow = NULL;
+HBRUSH CMainFrame::brushYellow = NULL;
HCURSOR CMainFrame::curDragging = NULL;
HCURSOR CMainFrame::curArrow = NULL;
HCURSOR CMainFrame::curNoDrop = NULL;
@@ -1755,6 +1756,8 @@
brushHighLight = CreateSolidBrush(GetSysColor(COLOR_HIGHLIGHT));
if (brushHighLightRed) DeleteObject(brushHighLightRed);
brushHighLightRed = CreateSolidBrush(RGB(0xFF,0x00,0x00));
+ if (brushYellow) DeleteObject(brushYellow);
+ brushYellow = CreateSolidBrush(RGB(0xFF,0xFF,0x00));
if (brushWindow) DeleteObject(brushWindow);
brushWindow = CreateSolidBrush(crBkgnd);
Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/mptrack/Mainfrm.h 2010-01-04 20:01:28 UTC (rev 455)
@@ -432,7 +432,7 @@
// GDI
static HICON m_hIcon;
static HFONT m_hGUIFont, m_hFixedFont, m_hLargeFixedFont;
- static HBRUSH brushGray, brushBlack, brushWhite, brushHighLight, brushHighLightRed, brushWindow;
+ static HBRUSH brushGray, brushBlack, brushWhite, brushHighLight, brushHighLightRed, brushWindow, brushYellow;
// static CBrush *pbrushBlack, *pbrushWhite;
static HPEN penBlack, penDarkGray, penLightGray, penWhite, penHalfDarkGray, penSample, penEnvelope, penEnvelopeHighlight, penSeparator, penScratch, penGray00, penGray33, penGray40, penGray55, penGray80, penGray99, penGraycc, penGrayff;
static HCURSOR curDragging, curNoDrop, curArrow, curNoDrop2, curVSplit;
Modified: trunk/OpenMPT/mptrack/View_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/mptrack/View_ins.cpp 2010-01-04 20:01:28 UTC (rev 455)
@@ -936,7 +936,7 @@
} else if (i == m_nDragItem - 1)
{
// currently selected env point
- m_dcMemMain.FrameRect(&rect, CBrush::FromHandle(CMainFrame::brushGray));
+ m_dcMemMain.FrameRect(&rect, CBrush::FromHandle(CMainFrame::brushYellow));
} else
{
m_dcMemMain.FrameRect(&rect, CBrush::FromHandle(CMainFrame::brushWhite));
@@ -1597,6 +1597,11 @@
{
SetCapture();
m_dwStatus |= INSSTATUS_DRAGGING;
+ // refrsh active node colour
+ if(GetDocument())
+ {
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
+ }
}
else
{
@@ -2253,7 +2258,7 @@
m_nDragItem = pEnv->nNodes;
else
m_nDragItem--;
- RedrawWindow();
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
}
@@ -2266,7 +2271,7 @@
m_nDragItem = 1;
else
m_nDragItem++;
- RedrawWindow();
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2278,7 +2283,10 @@
if(m_nDragItem == 1 || pEnv->Ticks[m_nDragItem - 1] == pEnv->Ticks[m_nDragItem - 2])
return;
pEnv->Ticks[m_nDragItem - 1]--;
- RedrawWindow();
+
+ CModDoc *pModDoc = GetDocument(); // sanity checks are done in GetEnvelopePtr() already
+ pModDoc->SetModified();
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2290,7 +2298,10 @@
if(m_nDragItem == 1 || (m_nDragItem < pEnv->nNodes && pEnv->Ticks[m_nDragItem - 1] == pEnv->Ticks[m_nDragItem]))
return;
pEnv->Ticks[m_nDragItem - 1]++;
- RedrawWindow();
+
+ CModDoc *pModDoc = GetDocument(); // sanity checks are done in GetEnvelopePtr() already
+ pModDoc->SetModified();
+ pModDoc->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
}
@@ -2303,7 +2314,10 @@
pEnv->Values[m_nDragItem - 1] += stepsize;
else
pEnv->Values[m_nDragItem - 1] = 64;
- RedrawWindow();
+
+ CModDoc *pModDoc = GetDocument(); // sanity checks are done in GetEnvelopePtr() already
+ pModDoc->SetModified();
+ pModDoc->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
}
@@ -2316,7 +2330,10 @@
pEnv->Values[m_nDragItem - 1] -= stepsize;
else
pEnv->Values[m_nDragItem - 1] = 0;
- RedrawWindow();
+
+ CModDoc *pModDoc = GetDocument(); // sanity checks are done in GetEnvelopePtr() already
+ pModDoc->SetModified();
+ pModDoc->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
}
void CViewInstrument::EnvKbdInsertPoint()
@@ -2336,7 +2353,6 @@
UINT newPoint = EnvInsertPoint(newTick, newVal);
if(newPoint > 0) m_nDragItem = newPoint;
- RedrawWindow();
}
@@ -2358,7 +2374,7 @@
if(!EnvGetLoop())
EnvSetLoopStart(0);
EnvSetLoopStart(m_nDragItem - 1);
- RedrawWindow();
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2373,7 +2389,7 @@
EnvSetLoopStart(0);
}
EnvSetLoopEnd(m_nDragItem - 1);
- RedrawWindow();
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2385,8 +2401,7 @@
if(!EnvGetSustain())
EnvSetSustain(true);
EnvSetSustainStart(m_nDragItem - 1);
- RedrawWindow();
-
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2401,8 +2416,7 @@
EnvSetSustainStart(0);
}
EnvSetSustainEnd(m_nDragItem - 1);
- RedrawWindow();
-
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
@@ -2412,7 +2426,7 @@
INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
EnvToggleReleaseNode(m_nDragItem - 1);
- RedrawWindow();
+ GetDocument()->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL); // sanity checks are done in GetEnvelopePtr() already
}
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2010-01-04 20:01:28 UTC (rev 455)
@@ -2310,17 +2310,26 @@
case MODITEM_SEQUENCE:
{
+ bool isCurSeq = false;
CModDoc *pModDoc = GetDocumentFromItem(hItem);
CSoundFile *pSndFile = (pModDoc) ? pModDoc->GetSoundFile() : nullptr;
- if(pModDoc && pSndFile && (pModDoc->GetModType() == MOD_TYPE_MPT) && pSndFile->Order.GetSequence((SEQUENCEINDEX)modItemID).GetLength() == 0)
+ if(pModDoc && pSndFile && (pModDoc->GetModType() == MOD_TYPE_MPT))
{
- nDefault = ID_MODTREE_SWITCHTO;
+ if(pSndFile->Order.GetSequence((SEQUENCEINDEX)modItemID).GetLength() == 0)
+ {
+ nDefault = ID_MODTREE_SWITCHTO;
+ }
+ isCurSeq = (pSndFile->Order.GetCurrentSequenceIndex() == (SEQUENCEINDEX)modItemID);
}
+
+ if(!isCurSeq)
+ {
+ AppendMenu(hMenu, MF_STRING, ID_MODTREE_SWITCHTO, "&Switch to Seqeuence");
+ }
+ AppendMenu(hMenu, MF_STRING, ID_MODTREE_INSERT, "&Insert Sequence");
+ AppendMenu(hMenu, MF_STRING, ID_MODTREE_DUPLICATE, "D&uplicate Sequence");
+ AppendMenu(hMenu, MF_STRING, ID_MODTREE_REMOVE, "&Delete Sequence");
}
- AppendMenu(hMenu, MF_STRING, ID_MODTREE_SWITCHTO, "&Switch to Seqeuence");
- AppendMenu(hMenu, MF_STRING, ID_MODTREE_INSERT, "&Insert Sequence");
- AppendMenu(hMenu, MF_STRING, ID_MODTREE_DUPLICATE, "D&uplicate Sequence");
- AppendMenu(hMenu, MF_STRING, ID_MODTREE_REMOVE, "&Delete Sequence");
break;
Modified: trunk/OpenMPT/mptrack/Vstplug.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Vstplug.cpp 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/mptrack/Vstplug.cpp 2010-01-04 20:01:28 UTC (rev 455)
@@ -1402,11 +1402,6 @@
if (result) *result = 0;
}
-#define MAX_FILEOPEN_BUFSIZE 2048
-//Note: Above value might be the maximum size the buffer can be;
-//it might be worthwhile to check the CFileDialog documentation
-//if wanting the increase that.
-
VOID CSelectPluginDlg::OnAddPlugin()
//----------------------------------
{
Modified: trunk/OpenMPT/mptrack/mptrack.rc
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.rc 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/mptrack/mptrack.rc 2010-01-04 20:01:28 UTC (rev 455)
@@ -450,7 +450,7 @@
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
- EDITTEXT IDC_EDIT_PATTERNNAME,439,31,108,12,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_PATTERNNAME,438,31,109,12,ES_AUTOHSCROLL
CONTROL "Toolbar1",IDC_TOOLBAR1,"ToolbarWindow32",WS_GROUP | 0x4d,2,4,370,18
CONTROL "Spin1",IDC_SPIN_INSTRUMENT,"msctls_updown32",0x0,6,31,11,12
PUSHBUTTON "Plugin",IDC_PATINSTROPLUGGUI,126,31,33,13,0,WS_EX_STATICEDGE
@@ -458,10 +458,12 @@
CONTROL "Loop Pattern",IDC_PATTERN_LOOP,"Button",BS_AUTOCHECKBOX | BS_FLAT | WS_TABSTOP,252,33,57,8
EDITTEXT IDC_EDIT_ORDERLIST_MARGINS,3,65,28,12,ES_AUTOHSCROLL | ES_READONLY
CONTROL "",IDC_SPIN_ORDERLIST_MARGINS,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_NOTHOUSANDS,16,70,11,11
- EDITTEXT IDC_EDIT_SEQUENCE_NAME,439,8,108,12,ES_AUTOHSCROLL
- CTEXT "Sequence Name",IDC_STATIC_SEQUENCE_NAME,384,10,53,8,SS_CENTERIMAGE
+ EDITTEXT IDC_EDIT_SEQUENCE_NAME,450,8,97,12,ES_AUTOHSCROLL
+ LTEXT "Sequence",IDC_STATIC_SEQUENCE_NAME,384,10,36,8
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
END
IDD_CONTROL_SAMPLES DIALOGEX 0, 0, 544, 106
Modified: trunk/OpenMPT/mptrack/resource.h
===================================================================
--- trunk/OpenMPT/mptrack/resource.h 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/mptrack/resource.h 2010-01-04 20:01:28 UTC (rev 455)
@@ -579,7 +579,9 @@
#define IDC_SPIN_SPACING 2032
#define IDC_EDIT_SPACING 2033
#define IDC_SAMPLE_NAME 2034
+#define IDC_EDIT_SEQNUM 2034
#define IDC_SAMPLE_FILENAME 2035
+#define IDC_SPIN_SEQNUM 2035
#define IDC_SAMPLE_NEW 2036
#define IDC_SAMPLE_OPEN 2037
#define IDC_SAMPLE_SAVEAS 2038
Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb
===================================================================
--- trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/packageTemplate/extraKeymaps/DE_jojo.mkb 2010-01-04 20:01:28 UTC (rev 455)
@@ -26,6 +26,7 @@
0:1362:2:86:1 //Paste: Ctrl+V (KeyDown)
0:1363:3:86:1 //Mix Paste: Shift+Ctrl+V (KeyDown)
0:1793:1:86:1 //Paste Flood: Shift+V (KeyDown)
+0:1820:6:86:1 //Push Forward Paste: Ctrl+Alt+V (KeyDown)
0:1364:2:53:1 //SelectAll: Ctrl+5 (KeyDown)
0:1365:2:70:1 //Find: Ctrl+F (KeyDown)
0:1366:0:114:1 //Find Next: F3 (KeyDown)
@@ -34,6 +35,7 @@
0:1023:4:83:1 //View Samples: Alt+S (KeyDown)
0:1024:4:78:1 //View Instruments: Alt+N (KeyDown)
0:1025:1:120:1 //View Comments: Shift+F9 (KeyDown)
+0:1025:4:67:1 //View Comments: Alt+C (KeyDown)
0:1368:2:113:1 //Toggle Tree View: Ctrl+F2 (KeyDown)
0:1369:2:112:1 //View Options: Ctrl+F1 (KeyDown)
0:1781:2:114:1 //View MIDI mapping: Ctrl+F3 (KeyDown)
@@ -272,6 +274,21 @@
8:1790:2:68:1 //Remove DC Offset: Ctrl+D (KeyDown)
//----( Instrument Context [bottom] (9) )------------
+9:1825:1:9:5 //Select previous envelope point: Shift+TABULATOR (KeyDown|KeyHold)
+9:1826:0:9:5 //Select next envelope point: TABULATOR (KeyDown|KeyHold)
+9:1821:0:37:5 //Move envelope point left: NACH-LINKS (KeyDown|KeyHold)
+9:1822:0:39:5 //Move envelope point right: NACH-RECHTS (KeyDown|KeyHold)
+9:1823:0:38:5 //Move envelope point up: NACH-OBEN (KeyDown|KeyHold)
+9:1834:0:33:5 //Move envelope point up (big step): BILD-NACH-OBEN (KeyDown|KeyHold)
+9:1824:0:40:5 //Move envelope point down: NACH-UNTEN (KeyDown|KeyHold)
+9:1835:0:34:5 //Move envelope point down (big step): BILD-NACH-UNTEN (KeyDown|KeyHold)
+9:1827:0:45:5 //Insert envelope point: EINFG (KeyDown|KeyHold)
+9:1828:0:46:5 //Remove envelope point: ENTF (KeyDown|KeyHold)
+9:1829:0:36:1 //Set loop start: POS1 (KeyDown)
+9:1830:0:35:1 //Set loop end: ENDE (KeyDown)
+9:1831:2:36:1 //Set sustain loop start: Ctrl+POS1 (KeyDown)
+9:1832:2:35:1 //Set sustain loop end: Ctrl+ENDE (KeyDown)
+9:1833:2:82:1 //Toggle release node: Ctrl+R (KeyDown)
//----( Comments Context [bottom] (10) )------------
Modified: trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_laptop_(legovitch).mkb
===================================================================
--- trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_laptop_(legovitch).mkb 2010-01-03 21:17:41 UTC (rev 454)
+++ trunk/OpenMPT/packageTemplate/extraKeymaps/FR_mpt_laptop_(legovitch).mkb 2010-01-04 20:01:28 UTC (rev 455)
@@ -31,7 +31,6 @@
0:1023:0:118:1 //View Samples: F7 (KeyDown)
0:1024:0:119:1 //View Instruments: F8 (KeyDown)
0:1025:0:120:1 //View Comments: F9 (KeyDown)
-0:1769:1:121:1 //View Graph: Shift+F10 (KeyDown)
0:1367:6:87:1 //Toggle Main View: Ctrl+Alt+W (KeyDown)
0:1368:0:112:1 //Toggle Tree View: F1 (KeyDown)
0:1369:2:112:1 //View Options: Ctrl+F1 (KeyDown)
@@ -268,6 +267,23 @@
8:1790:6:68:1 //Remove DC Offset: Ctrl+Alt+D (KeyDown)
//----( Instrument Context [bottom] (9) )------------
+9:1825:1:9:5 //Select previous envelope point: Shift+TAB (KeyDown|KeyHold)
+9:1825:0:166:5 //Select previous envelope point: (KeyDown|KeyHold)
+9:1826:0:9:5 //Select next envelope point: TAB (KeyDown|KeyHold)
+9:1826:0:167:5 //Select next envelope point: (KeyDown|KeyHold)
+9:1821:0:37:5 //Move envelope point left: GAUCHE (KeyDown|KeyHold)
+9:1822:0:39:5 //Move envelope point right: DROITE (KeyDown|KeyHold)
+9:1823:0:38:5 //Move envelope point up: HAUT (KeyDown|KeyHold)
+9:1834:0:33:5 //Move envelope point up (big step): PG.PREC (KeyDown|KeyHold)
+9:1824:0:40:5 //Move envelope point down: BAS (KeyDown|KeyHold)
+9:1835:0:34:5 //Move envelope point down (big step): PG.SUIV (KeyDown|KeyHold)
+9:1827:0:45:5 //Insert envelope point: INS (KeyDown|KeyHold)
+9:1828:0:46:5 //Remove envelope point: SUPPR (KeyDown|KeyHold)
+9:1829:0:36:1 //Set loop start: ORIGINE (KeyDown)
+9:1830:0:35:1 //Set loop end: FIN (KeyDown)
+9:1831:2:36:1 //Set sustain loop start: Ctrl+ORIGINE (KeyDown)
+9:1832:2:35:1 //Set sustain loop end: Ctrl+FIN (KeyDown)
+9:1833:2:82:1 //Toggle release node: Ctrl+R (KeyDown)
//----( Comments Context [bottom] (10) )------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-03 21:17:55
|
Revision: 454
http://modplug.svn.sourceforge.net/modplug/?rev=454&view=rev
Author: saga-games
Date: 2010-01-03 21:17:41 +0000 (Sun, 03 Jan 2010)
Log Message:
-----------
[Imp] Pattern Cleanup does now also work with multiple sequences
[Ref] Minor changes to code (modedit/load_xm)
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CleanupSong.cpp
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/soundlib/Load_xm.cpp
Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp 2010-01-02 01:23:14 UTC (rev 453)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp 2010-01-03 21:17:41 UTC (rev 454)
@@ -133,7 +133,7 @@
void CModCleanupDlg::OnCancel()
-//-------------------------
+//-----------------------------
{
CDialog::OnCancel();
}
@@ -166,7 +166,7 @@
}
void CModCleanupDlg::OnPresetCompoCleanup()
-//----------------------------------------
+//-----------------------------------------
{
// patterns
CheckDlgButton(IDC_CHK_CLEANUP_PATTERNS, MF_UNCHECKED);
@@ -191,6 +191,7 @@
}
BOOL CModCleanupDlg::OnToolTipNotify(UINT id, NMHDR* pNMHDR, LRESULT* pResult)
+//----------------------------------------------------------------------------
{
UNREFERENCED_PARAMETER(id);
UNREFERENCED_PARAMETER(pResult);
@@ -255,7 +256,7 @@
break;
// misc
case IDC_CHK_SAMPLEPACK:
- strTipText = "Convert the module to .IT and reset song, sample and instrument variables";
+ strTipText = "Convert the module to .IT and reset song / sample / instrument variables";
break;
}
@@ -279,61 +280,40 @@
// Actual cleanup implementations
// Remove unused patterns / rearrange patterns
+// If argument bRemove is true, unused patterns are removed. Else, patterns are only rearranged.
bool CModCleanupDlg::RemoveUnusedPatterns(bool bRemove)
//-----------------------------------------------------
{
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
if(pSndFile == nullptr) return false;
- if(pSndFile->GetType() == MOD_TYPE_MPT && pSndFile->Order.GetNumSequences() > 1)
- { // Multiple sequences are not taken into account in the code below. For now just make
- // removing unused patterns disabled in this case.
- AfxMessageBox(IDS_PATTERN_CLEANUP_UNAVAILABLE, MB_ICONINFORMATION);
- return false;
- }
+ const SEQUENCEINDEX maxSeqIndex = pSndFile->Order.GetNumSequences();
const PATTERNINDEX maxPatIndex = pSndFile->Patterns.Size();
- const ORDERINDEX maxOrdIndex = pSndFile->Order.size();
vector<PATTERNINDEX> nPatMap(maxPatIndex, 0);
vector<ROWINDEX> nPatRows(maxPatIndex, 0);
vector<MODCOMMAND*> pPatterns(maxPatIndex, nullptr);
vector<bool> bPatUsed(maxPatIndex, false);
- bool bSubtunesDetected = false;
- // detect subtunes (separated by "---")
- for(SEQUENCEINDEX nSeq = 0; nSeq < pSndFile->Order.GetNumSequences(); nSeq++)
- {
- if(pSndFile->Order.GetSequence(nSeq).GetLengthFirstEmpty() != pSndFile->Order.GetSequence(nSeq).GetLengthTailTrimmed())
- bSubtunesDetected = true;
- }
-
- // Flag to tell whether keeping sequence items which are after the first empty('---') order.
- bool bKeepSubSequences = false;
-
- if(bSubtunesDetected)
- { // There are used sequence items after first '---'; ask user whether to remove those.
- if (m_wParent->MessageBox(
- _TEXT("Do you want to remove sequence items which are after the first '---' item?"),
- _TEXT("Sequence Cleanup"), MB_YESNO) != IDYES
- )
- bKeepSubSequences = true;
- }
-
CHAR s[512];
- bool bEnd = false, bReordered = false;
+ bool bReordered = false;
UINT nPatRemoved = 0, nMinToRemove;
PATTERNINDEX nPats;
BeginWaitCursor();
PATTERNINDEX maxpat = 0;
- for (ORDERINDEX nOrd = 0; nOrd < maxOrdIndex; nOrd++)
+ for(SEQUENCEINDEX nSeq = 0; nSeq < maxSeqIndex; nSeq++)
{
- PATTERNINDEX n = pSndFile->Order[nOrd];
- if (n < maxPatIndex)
+ for (ORDERINDEX nOrd = 0; nOrd < pSndFile->Order.GetSequence(nSeq).GetLength(); nOrd++)
{
- if (n >= maxpat) maxpat = n + 1;
- if (!bEnd || bKeepSubSequences) bPatUsed[n] = true;
- } else if (n == pSndFile->Order.GetInvalidPatIndex()) bEnd = true;
+ PATTERNINDEX n = pSndFile->Order.GetSequence(nSeq)[nOrd];
+ if (n < maxPatIndex)
+ {
+ if (n >= maxpat) maxpat = n + 1;
+ bPatUsed[n] = true;
+ }
+ }
}
+
nMinToRemove = 0;
if (!bRemove)
{
@@ -371,33 +351,43 @@
BeginWaitCursor();
}
- for (UINT i = 0; i < maxPatIndex; i++) nPatMap[i] = PATTERNINDEX_INVALID;
- nPats = 0;
- ORDERINDEX imap = 0;
- for (imap = 0; imap < maxOrdIndex; imap++)
+ for(PATTERNINDEX i = 0; i < maxPatIndex; i++) nPatMap[i] = PATTERNINDEX_INVALID;
+
+ SEQUENCEINDEX oldSequence = pSndFile->Order.GetCurrentSequenceIndex(); // workaround, as GetSequence doesn't allow writing to sequences ATM
+
+ for(SEQUENCEINDEX nSeq = 0; nSeq < maxSeqIndex; nSeq++)
{
- PATTERNINDEX n = pSndFile->Order[imap];
- if (n < maxPatIndex)
+ pSndFile->Order.SetSequence(nSeq);
+ nPats = 0;
+ ORDERINDEX imap = 0;
+ for (imap = 0; imap < pSndFile->Order.GetSequence(nSeq).GetLength(); imap++)
{
- if (nPatMap[n] > maxPatIndex) nPatMap[n] = nPats++;
- pSndFile->Order[imap] = nPatMap[n];
- } else if (n == pSndFile->Order.GetInvalidPatIndex() && (bKeepSubSequences == false)) break;
- }
- // Add unused patterns at the end
- if ((!bRemove) || (!bWaste))
- {
- for (UINT iadd=0; iadd<maxPatIndex; iadd++)
+ PATTERNINDEX n = pSndFile->Order.GetSequence(nSeq)[imap];
+ if (n < maxPatIndex)
+ {
+ if (nPatMap[n] == PATTERNINDEX_INVALID) nPatMap[n] = nPats++;
+ pSndFile->Order[imap] = nPatMap[n];
+ }
+ }
+ // Add unused patterns at the end
+ if ((!bRemove) || (!bWaste))
{
- if ((pSndFile->Patterns[iadd]) && (nPatMap[iadd] >= maxPatIndex))
+ for(PATTERNINDEX iadd = 0; iadd < maxPatIndex; iadd++)
{
- nPatMap[iadd] = nPats++;
+ if((pSndFile->Patterns[iadd]) && (nPatMap[iadd] >= maxPatIndex))
+ {
+ nPatMap[iadd] = nPats++;
+ }
}
}
+ while (imap < pSndFile->Order.GetSequence(nSeq).GetLength())
+ {
+ pSndFile->Order[imap++] = pSndFile->Order.GetInvalidPatIndex();
+ }
}
- while (imap < maxOrdIndex)
- {
- pSndFile->Order[imap++] = pSndFile->Order.GetInvalidPatIndex();
- }
+
+ pSndFile->Order.SetSequence(oldSequence);
+
// Reorder patterns & Delete unused patterns
BEGIN_CRITICAL();
{
@@ -432,9 +422,9 @@
nPatRemoved++;
}
}
- for (PATTERNINDEX j = 0; j < maxPatIndex;j++)
+ for (PATTERNINDEX nPat = 0; nPat < maxPatIndex; nPat++)
{
- pSndFile->Patterns[j].SetData(pPatterns[j], nPatRows[j]);
+ pSndFile->Patterns[nPat].SetData(pPatterns[nPat], nPatRows[nPat]);
}
}
END_CRITICAL();
@@ -455,7 +445,7 @@
// Remove unused samples
bool CModCleanupDlg::RemoveUnusedSamples()
-//---------------------------------
+//----------------------------------------
{
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
if(pSndFile == nullptr) return false;
@@ -778,7 +768,7 @@
// Remove ununsed plugins
bool CModCleanupDlg::RemoveUnusedPlugins()
-//--------------------------------------
+//----------------------------------------
{
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
if(pSndFile == nullptr) return false;
@@ -846,7 +836,7 @@
m_pModDoc->ChangeModType(MOD_TYPE_IT);
pSndFile->m_nMixLevels = mixLevels_original;
pSndFile->m_nTempoMode = tempo_mode_classic;
- pSndFile->m_dwSongFlags = SONG_LINEARSLIDES | SONG_EXFILTERRANGE;
+ pSndFile->m_dwSongFlags = SONG_LINEARSLIDES;
// Global vars
pSndFile->m_nDefaultTempo = 125;
@@ -919,7 +909,7 @@
// Remove all samples
bool CModCleanupDlg::RemoveAllSamples()
-//------------------------------------
+//-------------------------------------
{
CSoundFile *pSndFile = m_pModDoc->GetSoundFile();
if(pSndFile == nullptr) return false;
@@ -985,7 +975,7 @@
// Remove all plugins
bool CModCleanupDlg::MergeSequences()
-//-------------------------------------
+//-----------------------------------
{
return m_pModDoc->MergeSequences();
}
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2010-01-02 01:23:14 UTC (rev 453)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2010-01-03 21:17:41 UTC (rev 454)
@@ -433,7 +433,7 @@
// Change the number of channels
BOOL CModDoc::ChangeNumChannels(UINT nNewChannels, const bool showCancelInRemoveDlg)
-//------------------------------------------------
+//----------------------------------------------------------------------------------
{
const CHANNELINDEX maxChans = m_SndFile.GetModSpecifications().channelsMax;
@@ -507,7 +507,7 @@
BOOL CModDoc::RemoveChannels(BOOL m_bChnMask[MAX_CHANNELS])
-//--------------------------------------------------------
+//---------------------------------------------------------
//To remove all channels whose index corresponds to true value at m_bChnMask[] array. Code is almost non-modified copy of
//the code which was in CModDoc::ChangeNumChannels(UINT nNewChannels) - the only differences are the lines before
//BeginWaitCursor(), few lines in the end and that nNewChannels is renamed to nRemaningChannels.
@@ -740,7 +740,7 @@
INSTRUMENTINDEX CModDoc::InsertInstrument(LONG lSample, LONG lDuplicate)
-//-----------------------------------------------------------
+//----------------------------------------------------------------------
{
MODINSTRUMENT *pDup = NULL;
INSTRUMENTINDEX nInstrumentMax = m_SndFile.GetModSpecifications().instrumentsMax - 1;
@@ -845,7 +845,7 @@
void CModDoc::InitializeInstrument(MODINSTRUMENT *pIns, UINT nsample)
-//----------------------------------------------------------------------
+//-------------------------------------------------------------------
{
memset(pIns, 0, sizeof(MODINSTRUMENT));
pIns->nFadeOut = 256;
@@ -976,7 +976,7 @@
BOOL CModDoc::ExpandPattern(PATTERNINDEX nPattern)
-//----------------------------------------
+//------------------------------------------------
{
// -> CODE#0008
// -> DESC="#define to set pattern size"
@@ -990,7 +990,7 @@
BOOL CModDoc::ShrinkPattern(PATTERNINDEX nPattern)
-//----------------------------------------
+//------------------------------------------------
{
if ((nPattern >= m_SndFile.Patterns.Size()) || (!m_SndFile.Patterns[nPattern])) return FALSE;
if(m_SndFile.Patterns[nPattern].Shrink())
@@ -1605,7 +1605,7 @@
void CModDoc::CheckUnusedChannels(BOOL mask[MAX_CHANNELS], CHANNELINDEX maxRemoveCount)
-//--------------------------------------------------------
+//-------------------------------------------------------------------------------------
{
// Checking for unused channels
for (int iRst=m_SndFile.m_nChannels-1; iRst>=0; iRst--) //rewbs.removeChanWindowCleanup
@@ -1632,7 +1632,7 @@
}
}
-// Merge multiple sequences
+// Merge multiple sequences into one sequence
bool CModDoc::MergeSequences()
//----------------------------
{
Modified: trunk/OpenMPT/soundlib/Load_xm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_xm.cpp 2010-01-02 01:23:14 UTC (rev 453)
+++ trunk/OpenMPT/soundlib/Load_xm.cpp 2010-01-03 21:17:41 UTC (rev 454)
@@ -733,7 +733,7 @@
BYTE xmph[9];
FILE *f;
int i;
- BOOL bAddChannel = false; // avoid odd channel count for FT2 compatibility
+ bool bAddChannel = false; // avoid odd channel count for FT2 compatibility
if(bCompatibilityExport) nPacking = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sag...@us...> - 2010-01-02 01:23:26
|
Revision: 453
http://modplug.svn.sourceforge.net/modplug/?rev=453&view=rev
Author: saga-games
Date: 2010-01-02 01:23:14 +0000 (Sat, 02 Jan 2010)
Log Message:
-----------
[New] Instrument Editor: Envelopes can be edited using keyboard. Various keyboard shortcuts have been added to move and edit envelope points. This uses a common "drag and drop" node with mouse editing, so a point can first be clicked and the be moved with f.e. cursor keys.
[Mod] Made Graph and Pattern Randomizer shortcuts invisible.
[Ref] Some more internal refactoring.
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/CommandSet.h
trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
trunk/OpenMPT/mptrack/Mainfrm.h
trunk/OpenMPT/mptrack/View_ins.cpp
trunk/OpenMPT/mptrack/View_ins.h
trunk/OpenMPT/mptrack/View_smp.cpp
trunk/OpenMPT/mptrack/res/smptoolb.bmp
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2009-12-30 21:54:16 UTC (rev 452)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2010-01-02 01:23:14 UTC (rev 453)
@@ -2219,7 +2219,7 @@
commands[kcPatternGoto].isDummy = false;
commands[kcPatternOpenRandomizer].UID = 1767;
- commands[kcPatternOpenRandomizer].isHidden = false;
+ commands[kcPatternOpenRandomizer].isHidden = true; // while there's not randomizer yet, let's just disable it for now
commands[kcPatternOpenRandomizer].isDummy = false;
commands[kcPatternOpenRandomizer].Message = "Open pattern randomizer";
@@ -2230,7 +2230,7 @@
//rewbs.graph
commands[kcViewGraph].UID = 1769;
- commands[kcViewGraph].isHidden = false;
+ commands[kcViewGraph].isHidden = true; // while there's no graph yet, let's just disable it for now
commands[kcViewGraph].isDummy = false;
commands[kcViewGraph].Message = "View Graph";
//end rewbs.graph
@@ -2485,6 +2485,81 @@
commands[kcEditPushForwardPaste].isDummy = false;
commands[kcEditPushForwardPaste].Message = "Push Forward Paste";
+ commands[kcInstrumentEnvelopePointMoveLeft].UID = 1821;
+ commands[kcInstrumentEnvelopePointMoveLeft].isHidden = false;
+ commands[kcInstrumentEnvelopePointMoveLeft].isDummy = false;
+ commands[kcInstrumentEnvelopePointMoveLeft].Message = "Move envelope point left";
+
+ commands[kcInstrumentEnvelopePointMoveRight].UID = 1822;
+ commands[kcInstrumentEnvelopePointMoveRight].isHidden = false;
+ commands[kcInstrumentEnvelopePointMoveRight].isDummy = false;
+ commands[kcInstrumentEnvelopePointMoveRight].Message = "Move envelope point right";
+
+ commands[kcInstrumentEnvelopePointMoveUp].UID = 1823;
+ commands[kcInstrumentEnvelopePointMoveUp].isHidden = false;
+ commands[kcInstrumentEnvelopePointMoveUp].isDummy = false;
+ commands[kcInstrumentEnvelopePointMoveUp].Message = "Move envelope point up";
+
+ commands[kcInstrumentEnvelopePointMoveDown].UID = 1824;
+ commands[kcInstrumentEnvelopePointMoveDown].isHidden = false;
+ commands[kcInstrumentEnvelopePointMoveDown].isDummy = false;
+ commands[kcInstrumentEnvelopePointMoveDown].Message = "Move envelope point down";
+
+ commands[kcInstrumentEnvelopePointPrev].UID = 1825;
+ commands[kcInstrumentEnvelopePointPrev].isHidden = false;
+ commands[kcInstrumentEnvelopePointPrev].isDummy = false;
+ commands[kcInstrumentEnvelopePointPrev].Message = "Select previous envelope point";
+
+ commands[kcInstrumentEnvelopePointNext].UID = 1826;
+ commands[kcInstrumentEnvelopePointNext].isHidden = false;
+ commands[kcInstrumentEnvelopePointNext].isDummy = false;
+ commands[kcInstrumentEnvelopePointNext].Message = "Select next envelope point";
+
+ commands[kcInstrumentEnvelopePointInsert].UID = 1827;
+ commands[kcInstrumentEnvelopePointInsert].isHidden = false;
+ commands[kcInstrumentEnvelopePointInsert].isDummy = false;
+ commands[kcInstrumentEnvelopePointInsert].Message = "Insert envelope point";
+
+ commands[kcInstrumentEnvelopePointRemove].UID = 1828;
+ commands[kcInstrumentEnvelopePointRemove].isHidden = false;
+ commands[kcInstrumentEnvelopePointRemove].isDummy = false;
+ commands[kcInstrumentEnvelopePointRemove].Message = "Remove envelope point";
+
+ commands[kcInstrumentEnvelopeSetLoopStart].UID = 1829;
+ commands[kcInstrumentEnvelopeSetLoopStart].isHidden = false;
+ commands[kcInstrumentEnvelopeSetLoopStart].isDummy = false;
+ commands[kcInstrumentEnvelopeSetLoopStart].Message = "Set loop start";
+
+ commands[kcInstrumentEnvelopeSetLoopEnd].UID = 1830;
+ commands[kcInstrumentEnvelopeSetLoopEnd].isHidden = false;
+ commands[kcInstrumentEnvelopeSetLoopEnd].isDummy = false;
+ commands[kcInstrumentEnvelopeSetLoopEnd].Message = "Set loop end";
+
+ commands[kcInstrumentEnvelopeSetSustainLoopStart].UID = 1831;
+ commands[kcInstrumentEnvelopeSetSustainLoopStart].isHidden = false;
+ commands[kcInstrumentEnvelopeSetSustainLoopStart].isDummy = false;
+ commands[kcInstrumentEnvelopeSetSustainLoopStart].Message = "Set sustain loop start";
+
+ commands[kcInstrumentEnvelopeSetSustainLoopEnd].UID = 1832;
+ commands[kcInstrumentEnvelopeSetSustainLoopEnd].isHidden = false;
+ commands[kcInstrumentEnvelopeSetSustainLoopEnd].isDummy = false;
+ commands[kcInstrumentEnvelopeSetSustainLoopEnd].Message = "Set sustain loop end";
+
+ commands[kcInstrumentEnvelopeToggleReleaseNode].UID = 1833;
+ commands[kcInstrumentEnvelopeToggleReleaseNode].isHidden = false;
+ commands[kcInstrumentEnvelopeToggleReleaseNode].isDummy = false;
+ commands[kcInstrumentEnvelopeToggleReleaseNode].Message = "Toggle release node";
+
+ commands[kcInstrumentEnvelopePointMoveUp8].UID = 1834;
+ commands[kcInstrumentEnvelopePointMoveUp8].isHidden = false;
+ commands[kcInstrumentEnvelopePointMoveUp8].isDummy = false;
+ commands[kcInstrumentEnvelopePointMoveUp8].Message = "Move envelope point up (big step)";
+
+ commands[kcInstrumentEnvelopePointMoveDown8].UID = 1835;
+ commands[kcInstrumentEnvelopePointMoveDown8].isHidden = false;
+ commands[kcInstrumentEnvelopePointMoveDown8].isDummy = false;
+ commands[kcInstrumentEnvelopePointMoveDown8].Message = "Move envelope point down (big step)";
+
#ifdef _DEBUG
for (int i=0; i<kcNumCommands; i++) {
if (commands[i].UID != 0) { // ignore unset UIDs
Modified: trunk/OpenMPT/mptrack/CommandSet.h
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.h 2009-12-30 21:54:16 UTC (rev 452)
+++ trunk/OpenMPT/mptrack/CommandSet.h 2010-01-02 01:23:14 UTC (rev 453)
@@ -549,7 +549,22 @@
kcInstrumentLoad=kcStartInstrumentMisc,
kcInstrumentSave,
kcInstrumentNew,
- kcEndInstrumentMisc=kcInstrumentNew,
+ kcInstrumentEnvelopePointPrev,
+ kcInstrumentEnvelopePointNext,
+ kcInstrumentEnvelopePointMoveLeft,
+ kcInstrumentEnvelopePointMoveRight,
+ kcInstrumentEnvelopePointMoveUp,
+ kcInstrumentEnvelopePointMoveUp8,
+ kcInstrumentEnvelopePointMoveDown,
+ kcInstrumentEnvelopePointMoveDown8,
+ kcInstrumentEnvelopePointInsert,
+ kcInstrumentEnvelopePointRemove,
+ kcInstrumentEnvelopeSetLoopStart,
+ kcInstrumentEnvelopeSetLoopEnd,
+ kcInstrumentEnvelopeSetSustainLoopStart,
+ kcInstrumentEnvelopeSetSustainLoopEnd,
+ kcInstrumentEnvelopeToggleReleaseNode,
+ kcEndInstrumentMisc=kcInstrumentEnvelopeToggleReleaseNode,
kcStartInstrumentCtrlMisc,
kcInstrumentCtrlLoad=kcStartInstrumentCtrlMisc,
Modified: trunk/OpenMPT/mptrack/KeyConfigDlg.cpp
===================================================================
--- trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2009-12-30 21:54:16 UTC (rev 452)
+++ trunk/OpenMPT/mptrack/KeyConfigDlg.cpp 2010-01-02 01:23:14 UTC (rev 453)
@@ -308,7 +308,9 @@
commandCategories.Add(*newCat);
delete newCat;
- newCat = new CommandCategory(" Instrument [Bottom]", kCtxViewInstruments);
+ newCat = new CommandCategory(" Instrument Editor", kCtxViewInstruments);
+ for (int c=kcStartInstrumentMisc; c<=kcEndInstrumentMisc; c++)
+ newCat->commands.Add(c);
commandCategories.Add(*newCat);
delete newCat;
Modified: trunk/OpenMPT/mptrack/Mainfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h 2009-12-30 21:54:16 UTC (rev 452)
+++ trunk/OpenMPT/mptrack/Mainfrm.h 2010-01-02 01:23:14 UTC (rev 453)
@@ -286,6 +286,42 @@
};
+// Sample editor toolbar image list index
+enum
+{
+ SIMAGE_CHECKED = 0,
+ SIMAGE_ZOOMUP,
+ SIMAGE_ZOOMDOWN,
+ SIMAGE_NODRAW,
+ SIMAGE_DRAW,
+ SIMAGE_RESIZE,
+ SIMAGE_GENERATE,
+};
+
+
+// Instrument editor toolbar image list index
+enum
+{
+ IIMAGE_CHECKED = 0,
+ IIMAGE_VOLENV,
+ IIMAGE_PANENV,
+ IIMAGE_PITCHENV,
+ IIMAGE_NOPITCHENV,
+ IIMAGE_LOOP,
+ IIMAGE_SUSTAIN,
+ IIMAGE_CARRY,
+ IIMAGE_NOCARRY,
+ IIMAGE_VOLSWITCH,
+ IIMAGE_PANSWITCH,
+ IIMAGE_PITCHSWITCH,
+ IIMAGE_FILTERSWITCH,
+ IIMAGE_NOPITCHSWITCH,
+ IIMAGE_NOFILTERSWITCH,
+ IIMAGE_SAMPLEMAP,
+ IIMAGE_GRID,
+};
+
+
/////////////////////////////////////////////////////////////////////////
// Player position notification
Modified: trunk/OpenMPT/mptrack/View_ins.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.cpp 2009-12-30 21:54:16 UTC (rev 452)
+++ trunk/OpenMPT/mptrack/View_ins.cpp 2010-01-02 01:23:14 UTC (rev 453)
@@ -13,10 +13,10 @@
#include "midi.h"
#define ENV_ZOOM 4
-#define ENV_DRAGLOOPSTART 0x100
-#define ENV_DRAGLOOPEND 0x200
-#define ENV_DRAGSUSTAINSTART 0x400
-#define ENV_DRAGSUSTAINEND 0x800
+#define ENV_DRAGLOOPSTART (MAX_ENVPOINTS + 1)
+#define ENV_DRAGLOOPEND (MAX_ENVPOINTS + 2)
+#define ENV_DRAGSUSTAINSTART (MAX_ENVPOINTS + 3)
+#define ENV_DRAGSUSTAINEND (MAX_ENVPOINTS + 4)
// Non-client toolbar
#define ENV_LEFTBAR_CY 29
@@ -117,6 +117,7 @@
m_GridSpeed = -1;
m_GridScrollPos = -1;
//end rewbs.envRowGrid
+ m_nDragItem = 1;
}
@@ -492,6 +493,23 @@
}
+bool CViewInstrument::EnvToggleReleaseNode(int nPoint)
+//----------------------------------------------------
+{
+ INSTRUMENTENVELOPE *envelope = GetEnvelopePtr();
+ if(envelope == nullptr) return false;
+ if(nPoint < 1 || nPoint > (int)EnvGetLastPoint()) return false;
+
+ if (envelope->nReleaseNode == nPoint)
+ {
+ envelope->nReleaseNode = ENV_RELEASE_NODE_UNSET;
+ } else
+ {
+ envelope->nReleaseNode = static_cast<BYTE>(nPoint);
+ }
+ return true;
+}
+
// Enable or disable a flag of the current envelope
bool CViewInstrument::EnvSetFlag(const DWORD dwFlag, const bool bEnable) const
//----------------------------------------------------------------------------
@@ -762,7 +780,7 @@
//rewbs.envRowGrid
void CViewInstrument::DrawGrid(CDC *pDC, UINT speed)
-//--------------------------------------------------------------------
+//--------------------------------------------------
{
int cachedScrollPos = GetScrollPos(SB_HORZ);
bool windowResized = false;
@@ -904,15 +922,23 @@
rect.top = y - 3;
rect.right = x + 4;
rect.bottom = y + 4;
- if (i) {
+ if (i)
+ {
m_dcMemMain.LineTo(x, y);
- } else {
+ } else
+ {
m_dcMemMain.MoveTo(x, y);
}
- if (i == releaseNode) {
+ if (i == releaseNode)
+ {
m_dcMemMain.FrameRect(&rect, CBrush::FromHandle(CMainFrame::brushHighLightRed));
m_dcMemMain.SelectObject(CMainFrame::penEnvelopeHighlight);
- } else {
+ } else if (i == m_nDragItem - 1)
+ {
+ // currently selected env point
+ m_dcMemMain.FrameRect(&rect, CBrush::FromHandle(CMainFrame::brushGray));
+ } else
+ {
m_dcMemMain.FrameRect(&rect, CBrush::FromHandle(CMainFrame::brushWhite));
}
@@ -959,11 +985,11 @@
return envelope->Ticks[EnvGetReleaseNode()];
}
-bool CViewInstrument::EnvRemovePoint()
-//------------------------------------
+bool CViewInstrument::EnvRemovePoint(UINT nPoint)
+//---------------------------------------------
{
CModDoc *pModDoc = GetDocument();
- if ((pModDoc) && (m_nDragItem) && (m_nDragItem-1 <= EnvGetLastPoint()))
+ if ((pModDoc) && (nPoint <= EnvGetLastPoint()))
{
CSoundFile *pSndFile = pModDoc->GetSoundFile();
MODINSTRUMENT *pIns = pSndFile->Instruments[m_nInstrument];
@@ -972,22 +998,28 @@
INSTRUMENTENVELOPE *envelope = GetEnvelopePtr();
if(envelope == nullptr || envelope->nNodes == 0) return false;
- UINT nPoint = m_nDragItem - 1;
-
envelope->nNodes--;
- for (UINT i=nPoint; i<envelope->nNodes; i++)
+ for (UINT i = nPoint; i < envelope->nNodes; i++)
{
envelope->Ticks[i] = envelope->Ticks[i + 1];
envelope->Values[i] = envelope->Values[i + 1];
}
- if (nPoint >= envelope->nNodes) nPoint = envelope->nNodes-1;
+ if (nPoint >= envelope->nNodes) nPoint = envelope->nNodes - 1;
if (envelope->nLoopStart > nPoint) envelope->nLoopStart--;
if (envelope->nLoopEnd > nPoint) envelope->nLoopEnd--;
if (envelope->nSustainStart > nPoint) envelope->nSustainStart--;
if (envelope->nSustainEnd > nPoint) envelope->nSustainEnd--;
- if (envelope->nReleaseNode>nPoint && envelope->nReleaseNode!=ENV_RELEASE_NODE_UNSET) envelope->nReleaseNode--;
+ if (envelope->nReleaseNode>nPoint && envelope->nReleaseNode != ENV_RELEASE_NODE_UNSET) envelope->nReleaseNode--;
envelope->Ticks[0] = 0;
+ if(envelope->nNodes == 1)
+ {
+ // if only one node is left, just disable the envelope completely
+ envelope->nNodes = envelope->nLoopStart = envelope->nLoopEnd = envelope->nSustainStart = envelope->nSustainEnd = 0;
+ envelope->dwFlags = 0;
+ envelope->nReleaseNode = ENV_RELEASE_NODE_UNSET;
+ }
+
pModDoc->SetModified();
pModDoc->UpdateAllViews(NULL, (m_nInstrument << HINT_SHIFT_INS) | HINT_ENVELOPE, NULL);
return true;
@@ -997,8 +1029,8 @@
}
// Insert point. Returns 0 if error occured, else point ID + 1.
-UINT CViewInstrument::EnvInsertPoint()
-//------------------------------------
+UINT CViewInstrument::EnvInsertPoint(int nTick, int nValue)
+//---------------------------------------------------------
{
CModDoc *pModDoc = GetDocument();
if (pModDoc)
@@ -1007,14 +1039,12 @@
MODINSTRUMENT *pIns = pSndFile->Instruments[m_nInstrument];
if (pIns)
{
- int nTick = ScreenToTick(m_ptMenu.x);
- int nValue = ScreenToValue(m_ptMenu.y);
- if(nTick < 0) return false;
+ if(nTick < 0) return 0;
nValue = CLAMP(nValue, 0, 64);
INSTRUMENTENVELOPE *envelope = GetEnvelopePtr();
- if(envelope == nullptr) return false;
+ if(envelope == nullptr) return 0;
BYTE cDefaultValue;
switch(m_nEnv)
@@ -1029,7 +1059,7 @@
cDefaultValue = (pIns->PitchEnv.dwFlags & ENV_FILTER) ? 64 : 32;
break;
default:
- return false;
+ return 0;
}
if (envelope->nNodes < pSndFile->GetModSpecifications().envelopePointsMax)
@@ -1180,18 +1210,18 @@
}
switch(cLeftBarButtons[nBtn])
{
- case ID_ENVSEL_VOLUME: nImage = 1; break;
- case ID_ENVSEL_PANNING: nImage = 2; break;
- case ID_ENVSEL_PITCH: nImage = (dwStyle & NCBTNS_DISABLED) ? 4 : 3; break;
- case ID_ENVELOPE_SETLOOP: nImage = 5; break;
- case ID_ENVELOPE_SUSTAIN: nImage = 6; break;
- case ID_ENVELOPE_CARRY: nImage = (dwStyle & NCBTNS_DISABLED) ? 8 : 7; break;
- case ID_ENVELOPE_VOLUME: nImage = 9; break;
- case ID_ENVELOPE_PANNING: nImage = 10; break;
- case ID_ENVELOPE_PITCH: nImage = (dwStyle & NCBTNS_DISABLED) ? 13 : 11; break;
- case ID_ENVELOPE_FILTER: nImage = (dwStyle & NCBTNS_DISABLED) ? 14 : 12; break;
- case ID_INSTRUMENT_SAMPLEMAP: nImage = 15; break;
- case ID_ENVELOPE_VIEWGRID: nImage = 16; break;
+ case ID_ENVSEL_VOLUME: nImage = IIMAGE_VOLENV; break;
+ case ID_ENVSEL_PANNING: nImage = IIMAGE_PANENV; break;
+ case ID_ENVSEL_PITCH: nImage = (dwStyle & NCBTNS_DISABLED) ? IIMAGE_NOPITCHENV : IIMAGE_PITCHENV; break;
+ case ID_ENVELOPE_SETLOOP: nImage = IIMAGE_LOOP; break;
+ case ID_ENVELOPE_SUSTAIN: nImage = IIMAGE_SUSTAIN; break;
+ case ID_ENVELOPE_CARRY: nImage = (dwStyle & NCBTNS_DISABLED) ? IIMAGE_NOCARRY : IIMAGE_CARRY; break;
+ case ID_ENVELOPE_VOLUME: nImage = IIMAGE_VOLSWITCH; break;
+ case ID_ENVELOPE_PANNING: nImage = IIMAGE_PANSWITCH; break;
+ case ID_ENVELOPE_PITCH: nImage = (dwStyle & NCBTNS_DISABLED) ? IIMAGE_NOPITCHSWITCH : IIMAGE_PITCHSWITCH; break;
+ case ID_ENVELOPE_FILTER: nImage = (dwStyle & NCBTNS_DISABLED) ? IIMAGE_NOFILTERSWITCH : IIMAGE_FILTERSWITCH; break;
+ case ID_INSTRUMENT_SAMPLEMAP: nImage = IIMAGE_SAMPLEMAP; break;
+ case ID_ENVELOPE_VIEWGRID: nImage = IIMAGE_GRID; break;
}
pDC->Draw3dRect(rect.left-1, rect.top-1, ENV_LEFTBAR_CXBTN+2, ENV_LEFTBAR_CYBTN+2, c3, c4);
pDC->Draw3dRect(rect.left, rect.top, ENV_LEFTBAR_CXBTN, ENV_LEFTBAR_CYBTN, c1, c2);
@@ -1199,7 +1229,7 @@
pDC->FillSolidRect(&rect, crFc);
rect.left += xofs;
rect.top += yofs;
- if (dwStyle & NCBTNS_CHECKED) m_bmpEnvBar.Draw(pDC, 0, rect.TopLeft(), ILD_NORMAL);
+ if (dwStyle & NCBTNS_CHECKED) m_bmpEnvBar.Draw(pDC, IIMAGE_CHECKED, rect.TopLeft(), ILD_NORMAL);
m_bmpEnvBar.Draw(pDC, nImage, rect.TopLeft(), ILD_NORMAL);
} else
{
@@ -1406,9 +1436,9 @@
{
BOOL bChanged = FALSE;
if (pt.x >= m_rcClient.right - 2) nTick++;
- if (m_nDragItem < 0x100)
+ if (m_nDragItem <= MAX_ENVPOINTS)
{
- bChanged = EnvSetValue(m_nDragItem-1, nTick, nVal);
+ bChanged = EnvSetValue(m_nDragItem - 1, nTick, nVal);
} else
{
int nPoint = ScreenToPoint(pt.x, pt.y);
@@ -1517,14 +1547,14 @@
// Look if dragging a point
UINT maxpoint = EnvGetLastPoint();
m_nDragItem = 0;
- for (UINT i=0; i<=maxpoint; i++)
+ for (UINT i = 0; i <= maxpoint; i++)
{
int x = PointToScreen(i);
int y = ValueToScreen(EnvGetValue(i));
rect.SetRect(x-6, y-6, x+7, y+7);
if (rect.PtInRect(pt))
{
- m_nDragItem = i+1;
+ m_nDragItem = i + 1;
break;
}
}
@@ -1552,7 +1582,7 @@
rect.top = m_rcClient.top;
rect.bottom = m_rcClient.bottom;
rect.right = PointToScreen(EnvGetLoopStart()) + 1;
- rect.left = rect.right - ENV_ZOOM*2;
+ rect.left = rect.right - ENV_ZOOM * 2;
if (rect.PtInRect(pt))
{
m_nDragItem = ENV_DRAGLOOPSTART;
@@ -1573,8 +1603,7 @@
// Shift-Click: Insert envelope point here
if(CMainFrame::GetMainFrame()->GetInputHandler()->ShiftPressed())
{
- m_ptMenu = pt;
- m_nDragItem = EnvInsertPoint(); // returns point ID + 1 if successful, else 0.
+ m_nDragItem = EnvInsertPoint(ScreenToTick(pt.x), ScreenToValue(pt.y)); // returns point ID + 1 if successful, else 0.
if(m_nDragItem > 0)
{
// Drag point if successful
@@ -1619,13 +1648,13 @@
UINT lastpoint = EnvGetLastPoint();
m_nDragItem = ScreenToPoint(pt.x, pt.y) + 1;
pSubMenu->EnableMenuItem(ID_ENVELOPE_INSERTPOINT, (lastpoint < maxpoint) ? MF_ENABLED : MF_GRAYED);
- pSubMenu->EnableMenuItem(ID_ENVELOPE_REMOVEPOINT, ((m_nDragItem) && (lastpoint > 1)) ? MF_ENABLED : MF_GRAYED);
- pSubMenu->EnableMenuItem(ID_ENVELOPE_CARRY, (pSndFile->m_nType & (MOD_TYPE_IT|MOD_TYPE_MPT)) ? MF_ENABLED : MF_GRAYED);
- pSubMenu->EnableMenuItem(ID_ENVELOPE_TOGGLERELEASENODE, (pSndFile->m_nType&(MOD_TYPE_IT|MOD_TYPE_MPT) && m_nEnv==ENV_VOLUME) ? MF_ENABLED : MF_GRAYED);
+ pSubMenu->EnableMenuItem(ID_ENVELOPE_REMOVEPOINT, ((m_nDragItem) && (lastpoint > 0)) ? MF_ENABLED : MF_GRAYED);
+ pSubMenu->EnableMenuItem(ID_ENVELOPE_CARRY, (pSndFile->GetType() & (MOD_TYPE_IT|MOD_TYPE_MPT)) ? MF_ENABLED : MF_GRAYED);
+ pSubMenu->EnableMenuItem(ID_ENVELOPE_TOGGLERELEASENODE, (pSndFile->GetType() & (MOD_TYPE_IT|MOD_TYPE_MPT) && m_nEnv == ENV_VOLUME) ? MF_ENABLED : MF_GRAYED);
pSubMenu->CheckMenuItem(ID_ENVELOPE_SETLOOP, (EnvGetLoop()) ? MF_CHECKED : MF_UNCHECKED);
pSubMenu->CheckMenuItem(ID_ENVELOPE_SUSTAIN, (EnvGetSustain()) ? MF_CHECKED : MF_UNCHECKED);
pSubMenu->CheckMenuItem(ID_ENVELOPE_CARRY, (EnvGetCarry()) ? MF_CHECKED : MF_UNCHECKED);
- pSubMenu->CheckMenuItem(ID_ENVELOPE_TOGGLERELEASENODE, (EnvGetReleaseNode()==m_nDragItem-1) ? MF_CHECKED : MF_UNCHECKED);
+ pSubMenu->CheckMenuItem(ID_ENVELOPE_TOGGLERELEASENODE, (EnvGetReleaseNode() == m_nDragItem - 1) ? MF_CHECKED : MF_UNCHECKED);
m_ptMenu = pt;
ClientToScreen(&pt);
pSubMenu->TrackPopupMenu(TPM_LEFTALIGN | TPM_RIGHTBUTTON,pt.x,pt.y,this);
@@ -1637,11 +1666,9 @@
//--------------------------------------------------
{
// Middle mouse button: Remove envelope point
- if(EnvGetLastPoint() <= 1) return;
+ if(EnvGetLastPoint() == 0) return;
m_nDragItem = ScreenToPoint(pt.x, pt.y) + 1;
- if(m_nDragItem == 0) return;
- m_ptMenu = pt;
- OnEnvRemovePoint();
+ EnvRemovePoint(m_nDragItem - 1);
}
@@ -1727,21 +1754,10 @@
void CViewInstrument::OnEnvToggleReleasNode()
//---------------------------------------------------
{
- UINT node = m_nDragItem-1;
-
- CModDoc *pModDoc = GetDocument();
- if ((pModDoc) && (node>0) && (node <= EnvGetLastPoint()))
+ if(m_nDragItem < 2 || m_nDragItem >= EnvGetLastPoint()) return;
+ if(EnvToggleReleaseNode(m_nDragItem - 1))
{
- INSTRUMENTENVELOPE *envelope = GetEnvelopePtr();
- if(envelope == nullptr) return;
-
- if (envelope->nReleaseNode == node) {
- envelope->nReleaseNode = ENV_RELEASE_NODE_UNSET;
- } else {
- envelope->nReleaseNode = static_cast<BYTE>(node);
- }
-
- pModDoc->SetModified();
+ if(GetDocument() != nullptr) GetDocument()->SetModified();
InvalidateRect(NULL, FALSE);
}
}
@@ -1811,13 +1827,17 @@
void CViewInstrument::OnEnvRemovePoint()
//--------------------------------------
{
- EnvRemovePoint();
+ if(m_nDragItem > 0)
+ {
+ EnvRemovePoint(m_nDragItem - 1);
+ }
}
void CViewInstrument::OnEnvInsertPoint()
//--------------------------------------
{
- EnvInsertPoint();
+
+ EnvInsertPoint(ScreenToTick(m_ptMenu.x), ScreenToValue(m_ptMenu.y));
}
@@ -2164,6 +2184,23 @@
case kcInstrumentLoad: SendCtrlMessage(IDC_INSTRUMENT_OPEN); return wParam;
case kcInstrumentSave: SendCtrlMessage(IDC_INSTRUMENT_SAVEAS); return wParam;
case kcInstrumentNew: SendCtrlMessage(IDC_INSTRUMENT_NEW); return wParam;
+
+ // envelope editor
+ case kcInstrumentEnvelopePointPrev: EnvKbdSelectPrevPoint(); return wParam;
+ case kcInstrumentEnvelopePointNext: EnvKbdSelectNextPoint(); return wParam;
+ case kcInstrumentEnvelopePointMoveLeft: EnvKbdMovePointLeft(); return wParam;
+ case kcInstrumentEnvelopePointMoveRight: EnvKbdMovePointRight(); return wParam;
+ case kcInstrumentEnvelopePointMoveUp: EnvKbdMovePointUp(1); return wParam;
+ case kcInstrumentEnvelopePointMoveDown: EnvKbdMovePointDown(1); return wParam;
+ case kcInstrumentEnvelopePointMoveUp8: EnvKbdMovePointUp(8); return wParam;
+ case kcInstrumentEnvelopePointMoveDown8: EnvKbdMovePointDown(8); return wParam;
+ case kcInstrumentEnvelopePointInsert: EnvKbdInsertPoint(); return wParam;
+ case kcInstrumentEnvelopePointRemove: EnvKbdRemovePoint(); return wParam;
+ case kcInstrumentEnvelopeSetLoopStart: EnvKbdSetLoopStart(); return wParam;
+ case kcInstrumentEnvelopeSetLoopEnd: EnvKbdSetLoopEnd(); return wParam;
+ case kcInstrumentEnvelopeSetSustainLoopStart: EnvKbdSetSustainStart(); return wParam;
+ case kcInstrumentEnvelopeSetSustainLoopEnd: EnvKbdSetSustainEnd(); return wParam;
+ case kcInstrumentEnvelopeToggleReleaseNode: EnvKbdToggleReleaseNode(); return wParam;
}
if (wParam>=kcInstrumentStartNotes && wParam<=kcInstrumentEndNotes)
{
@@ -2204,6 +2241,181 @@
}
+////////////////////////////////////////
+// Envelope Editor - Keyboard actions
+
+void CViewInstrument::EnvKbdSelectPrevPoint()
+//-------------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr) return;
+ if(m_nDragItem <= 1 || m_nDragItem > pEnv->nNodes)
+ m_nDragItem = pEnv->nNodes;
+ else
+ m_nDragItem--;
+ RedrawWindow();
+}
+
+
+void CViewInstrument::EnvKbdSelectNextPoint()
+//-------------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr) return;
+ if(m_nDragItem >= pEnv->nNodes)
+ m_nDragItem = 1;
+ else
+ m_nDragItem++;
+ RedrawWindow();
+}
+
+
+void CViewInstrument::EnvKbdMovePointLeft()
+//-----------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(m_nDragItem == 1 || pEnv->Ticks[m_nDragItem - 1] == pEnv->Ticks[m_nDragItem - 2])
+ return;
+ pEnv->Ticks[m_nDragItem - 1]--;
+ RedrawWindow();
+}
+
+
+void CViewInstrument::EnvKbdMovePointRight()
+//------------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(m_nDragItem == 1 || (m_nDragItem < pEnv->nNodes && pEnv->Ticks[m_nDragItem - 1] == pEnv->Ticks[m_nDragItem]))
+ return;
+ pEnv->Ticks[m_nDragItem - 1]++;
+ RedrawWindow();
+}
+
+
+void CViewInstrument::EnvKbdMovePointUp(BYTE stepsize)
+//----------------------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv->Values[m_nDragItem - 1] <= 64 - stepsize)
+ pEnv->Values[m_nDragItem - 1] += stepsize;
+ else
+ pEnv->Values[m_nDragItem - 1] = 64;
+ RedrawWindow();
+}
+
+
+void CViewInstrument::EnvKbdMovePointDown(BYTE stepsize)
+//------------------------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(pEnv->Values[m_nDragItem - 1] >= stepsize)
+ pEnv->Values[m_nDragItem - 1] -= stepsize;
+ else
+ pEnv->Values[m_nDragItem - 1] = 0;
+ RedrawWindow();
+}
+
+void CViewInstrument::EnvKbdInsertPoint()
+//---------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr) return;
+ if(m_nDragItem > pEnv->nNodes) m_nDragItem = pEnv->nNodes;
+ WORD newTick = pEnv->Ticks[pEnv->nNodes - 1] + 4; // if last point is selected: add point after last point
+ BYTE newVal = pEnv->Values[pEnv->nNodes - 1];
+ // if some other point is selected: interpolate between this and next point (if there's room between them)
+ if(m_nDragItem < pEnv->nNodes && (pEnv->Ticks[m_nDragItem] - pEnv->Ticks[m_nDragItem - 1] > 1))
+ {
+ newTick = (pEnv->Ticks[m_nDragItem - 1] + pEnv->Ticks[m_nDragItem]) / 2;
+ newVal = (pEnv->Values[m_nDragItem - 1] + pEnv->Values[m_nDragItem]) / 2;
+ }
+
+ UINT newPoint = EnvInsertPoint(newTick, newVal);
+ if(newPoint > 0) m_nDragItem = newPoint;
+ RedrawWindow();
+}
+
+
+void CViewInstrument::EnvKbdRemovePoint()
+//---------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || pEnv->nNodes == 0) return;
+ if(m_nDragItem > pEnv->nNodes) m_nDragItem = pEnv->nNodes;
+ EnvRemovePoint(m_nDragItem - 1);
+}
+
+
+void CViewInstrument::EnvKbdSetLoopStart()
+//----------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(!EnvGetLoop())
+ EnvSetLoopStart(0);
+ EnvSetLoopStart(m_nDragItem - 1);
+ RedrawWindow();
+}
+
+
+void CViewInstrument::EnvKbdSetLoopEnd()
+//--------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(!EnvGetLoop())
+ {
+ EnvSetLoop(true);
+ EnvSetLoopStart(0);
+ }
+ EnvSetLoopEnd(m_nDragItem - 1);
+ RedrawWindow();
+}
+
+
+void CViewInstrument::EnvKbdSetSustainStart()
+//-------------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(!EnvGetSustain())
+ EnvSetSustain(true);
+ EnvSetSustainStart(m_nDragItem - 1);
+ RedrawWindow();
+
+}
+
+
+void CViewInstrument::EnvKbdSetSustainEnd()
+//-----------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ if(!EnvGetSustain())
+ {
+ EnvSetSustain(true);
+ EnvSetSustainStart(0);
+ }
+ EnvSetSustainEnd(m_nDragItem - 1);
+ RedrawWindow();
+
+}
+
+
+void CViewInstrument::EnvKbdToggleReleaseNode()
+//---------------------------------------------
+{
+ INSTRUMENTENVELOPE *pEnv = GetEnvelopePtr();
+ if(pEnv == nullptr || m_nDragItem == 0 || m_nDragItem > pEnv->nNodes) return;
+ EnvToggleReleaseNode(m_nDragItem - 1);
+ RedrawWindow();
+}
+
+
// Get a pointer to the currently selected envelope.
INSTRUMENTENVELOPE *CViewInstrument::GetEnvelopePtr() const
//---------------------------------------------------------
Modified: trunk/OpenMPT/mptrack/View_ins.h
===================================================================
--- trunk/OpenMPT/mptrack/View_ins.h 2009-12-30 21:54:16 UTC (rev 452)
+++ trunk/OpenMPT/mptrack/View_ins.h 2010-01-02 01:23:14 UTC (rev 453)
@@ -85,6 +85,7 @@
bool EnvSetLoopEnd(int nPoint);
bool EnvSetSustainStart(int nPoint);
bool EnvSetSustainEnd(int nPoint);
+ bool EnvToggleReleaseNode(int nPoint);
// Set envelope status
bool EnvToggleEnv(INSTRUMENTENVELOPE *pEnv, CSoundFile *pSndFile, MODINSTRUMENT *pIns, bool bEnable, BYTE cDefaultValue, DWORD dwChanFlag, DWORD dwExtraFlags = 0);
@@ -93,13 +94,28 @@
bool EnvSetPitchEnv(bool bEnable);
bool EnvSetFilterEnv(bool bEnable);
+ // Keyboard envelope control
+ void EnvKbdSelectPrevPoint();
+ void EnvKbdSelectNextPoint();
+ void EnvKbdMovePointLeft();
+ void EnvKbdMovePointRight();
+ void EnvKbdMovePointUp(BYTE stepsize = 1);
+ void EnvKbdMovePointDown(BYTE stepsize = 1);
+ void EnvKbdInsertPoint();
+ void EnvKbdRemovePoint();
+ void EnvKbdSetLoopStart();
+ void EnvKbdSetLoopEnd();
+ void EnvKbdSetSustainStart();
+ void EnvKbdSetSustainEnd();
+ void EnvKbdToggleReleaseNode();
+
////////////////////////
// Misc stuff
void UpdateScrollSize();
BOOL SetCurrentInstrument(INSTRUMENTINDEX nIns, enmEnvelopeTypes m_nEnv = ENV_VOLUME);
INSTRUMENTENVELOPE *GetEnvelopePtr() const;
- UINT EnvInsertPoint();
- bool EnvRemovePoint();
+ UINT EnvInsertPoint(int nTick, int nValue);
+ bool EnvRemovePoint(UINT nPoint);
int TickToScreen(int nTick) const;
int PointToScreen(int nPoint) const;
int ScreenToTick(int x) const;
Modified: trunk/OpenMPT/mptrack/View_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_smp.cpp 2009-12-30 21:54:16 UTC (rev 452)
+++ trunk/OpenMPT/mptrack/View_smp.cpp 2010-01-02 01:23:14 UTC (rev 453)
@@ -1005,10 +1005,10 @@
}
switch(cLeftBarButtons[nBtn])
{
- case ID_SAMPLE_ZOOMUP: nImage = 1; break;
- case ID_SAMPLE_ZOOMDOWN: nImage = 2; break;
- case ID_SAMPLE_DRAW: nImage = (dwStyle & NCBTNS_DISABLED) ? 18 : 16; break;
- case ID_SAMPLE_ADDSILENCE: nImage = 17; break;
+ case ID_SAMPLE_ZOOMUP: nImage = SIMAGE_ZOOMUP; break;
+ case ID_SAMPLE_ZOOMDOWN: nImage = SIMAGE_ZOOMDOWN; break;
+ case ID_SAMPLE_DRAW: nImage = (dwStyle & NCBTNS_DISABLED) ? SIMAGE_NODRAW : SIMAGE_DRAW; break;
+ case ID_SAMPLE_ADDSILENCE: nImage = SIMAGE_RESIZE; break;
}
pDC->Draw3dRect(rect.left-1, rect.top-1, SMP_LEFTBAR_CXBTN+2, SMP_LEFTBAR_CYBTN+2, c3, c4);
pDC->Draw3dRect(rect.left, rect.top, SMP_LEFTBAR_CXBTN, SMP_LEFTBAR_CYBTN, c1, c2);
@@ -1016,7 +1016,7 @@
pDC->FillSolidRect(&rect, crFc);
rect.left += xofs;
rect.top += yofs;
- if (dwStyle & NCBTNS_CHECKED) m_bmpEnvBar.Draw(pDC, 0, rect.TopLeft(), ILD_NORMAL);
+ if (dwStyle & NCBTNS_CHECKED) m_bmpEnvBar.Draw(pDC, SIMAGE_CHECKED, rect.TopLeft(), ILD_NORMAL);
m_bmpEnvBar.Draw(pDC, nImage, rect.TopLeft(), ILD_NORMAL);
} else
{
Modified: trunk/OpenMPT/mptrack/res/smptoolb.bmp
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rel...@us...> - 2009-12-30 21:54:27
|
Revision: 452
http://modplug.svn.sourceforge.net/modplug/?rev=452&view=rev
Author: relabsoluness
Date: 2009-12-30 21:54:16 +0000 (Wed, 30 Dec 2009)
Log Message:
-----------
[Imp] Pattern editor: If keyboard split is active, instrument drop list will show split instrument and split note.
[Mod] Pattern c&p: Mix paste shouldn't anymore trigger conversion on modcommands that weren't changed at all (appeared in rev. 403). Now, however, partial conversion will not be done so this still needs further fixing.
[Fix] Pattern c&p: Mix paste should behave better with parameter control notes.
[Ref/Fix] Minor tweaks and fixes (fixes to use of CStrings in wsprintf parameters, cleaned compiler warnings, small adjustment to orderlist resizing after loading module...)
Modified Paths:
--------------
trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
trunk/OpenMPT/mptrack/Ctrl_pat.cpp
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/Mod2wave.cpp
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Moddoc.h
trunk/OpenMPT/mptrack/Modedit.cpp
trunk/OpenMPT/mptrack/View_pat.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/fxp.cpp
trunk/OpenMPT/mptrack/misc_util.cpp
trunk/OpenMPT/mptrack/misc_util.h
trunk/OpenMPT/mptrack/typedefs.h
trunk/OpenMPT/soundlib/Sndfile.cpp
trunk/OpenMPT/soundlib/Sndfile.h
trunk/OpenMPT/soundlib/modcommand.h
Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -175,11 +175,11 @@
if(m_pVstPlugin->GetNumPrograms() > 0 && m_pMenu->GetMenuItemCount() < 5)
{
- m_pMenu->AppendMenu(MF_BYPOSITION, ID_VSTPRESETBACKWARDJUMP, (LPCTSTR)"<<");
- m_pMenu->AppendMenu(MF_BYPOSITION, ID_PREVIOUSVSTPRESET, (LPCTSTR)"<");
- m_pMenu->AppendMenu(MF_BYPOSITION, ID_NEXTVSTPRESET, (LPCTSTR)">");
- m_pMenu->AppendMenu(MF_BYPOSITION, ID_VSTPRESETFORWARDJUMP, (LPCTSTR)">>");
- m_pMenu->AppendMenu(MF_BYPOSITION|MF_DISABLED, 0, "");
+ m_pMenu->AppendMenu(MF_BYPOSITION, ID_VSTPRESETBACKWARDJUMP, TEXT("<<"));
+ m_pMenu->AppendMenu(MF_BYPOSITION, ID_PREVIOUSVSTPRESET, TEXT("<"));
+ m_pMenu->AppendMenu(MF_BYPOSITION, ID_NEXTVSTPRESET, TEXT(">"));
+ m_pMenu->AppendMenu(MF_BYPOSITION, ID_VSTPRESETFORWARDJUMP, TEXT(">>"));
+ m_pMenu->AppendMenu(MF_BYPOSITION|MF_DISABLED, 0, TEXT(""));
}
long index = m_pVstPlugin->GetCurrentProgram();
@@ -470,7 +470,7 @@
m_pInputMenu->AppendMenu(MF_SEPARATOR);
}
name.Format("Ins%02d: %s", inputInstruments[nIns], pSndFile->Instruments[inputInstruments[nIns]]->name);
- if (inputInstruments[nIns]==m_nInstrument) checked=true;
+ if (inputInstruments[nIns] == (UINT)m_nInstrument) checked=true;
m_pInputMenu->AppendMenu(MF_STRING|(checked?MF_CHECKED:0), ID_SELECTINST+inputInstruments[nIns], name);
}
Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -254,29 +254,47 @@
LockControls();
if (dwHintMask & (HINT_MODTYPE|HINT_INSNAMES|HINT_SMPNAMES))
{
+ static const TCHAR szSplitFormat[] = TEXT("%02u %s %02u: %s/%s");
UINT nPos = 0;
m_CbnInstrument.SetRedraw(FALSE);
m_CbnInstrument.ResetContent();
m_CbnInstrument.SetItemData(m_CbnInstrument.AddString(" No Instrument"), 0);
- if (m_pSndFile->m_nInstruments) {
- for (UINT i=1; i<=m_pSndFile->m_nInstruments; i++) {
+ const INSTRUMENTINDEX nSplitIns = m_pModDoc->GetSplitKeyboardSettings()->splitInstrument;
+ const MODCOMMAND::NOTE noteSplit = 1 + m_pModDoc->GetSplitKeyboardSettings()->splitNote;
+ const CString sSplitInsName = m_pModDoc->GetPatternViewInstrumentName(nSplitIns, true, false);
+ if (m_pSndFile->m_nInstruments)
+ {
+ for (UINT i=1; i<=m_pSndFile->m_nInstruments; i++)
+ {
if (m_pSndFile->Instruments[i] == NULL) {
continue;
}
- CString displayName = m_pSndFile->GetPatternViewInstrumentName(i);
- UINT n = m_CbnInstrument.AddString(displayName);
+ CString sDisplayName;
+ if (m_pModDoc->GetSplitKeyboardSettings()->IsSplitActive())
+ {
+ wsprintf(s, szSplitFormat, nSplitIns, GetNoteStr(noteSplit), i,
+ (LPCTSTR)sSplitInsName, (LPCTSTR)m_pModDoc->GetPatternViewInstrumentName(i, true, false));
+ sDisplayName = s;
+ }
+ else
+ sDisplayName = m_pModDoc->GetPatternViewInstrumentName(i);
+
+ UINT n = m_CbnInstrument.AddString(sDisplayName);
if (n == m_nInstrument) nPos = n;
m_CbnInstrument.SetItemData(n, i);
-
}
-
} else
{
UINT nmax = m_pSndFile->m_nSamples;
while ((nmax > 1) && (m_pSndFile->Samples[nmax].pSample == NULL) && (!m_pSndFile->m_szNames[nmax][0])) nmax--;
- for (UINT i=1; i<=nmax; i++) if ((m_pSndFile->m_szNames[i][0]) || (m_pSndFile->Samples[i].pSample)) {
- wsprintf(s, "%02d: %s", i, m_pSndFile->m_szNames[i]);
+ for (UINT i=1; i<=nmax; i++) if ((m_pSndFile->m_szNames[i][0]) || (m_pSndFile->Samples[i].pSample))
+ {
+ if (m_pModDoc->GetSplitKeyboardSettings()->IsSplitActive() && nSplitIns < ARRAYELEMCOUNT(m_pSndFile->m_szNames))
+ wsprintf(s, szSplitFormat, nSplitIns, GetNoteStr(noteSplit), i, m_pSndFile->m_szNames[nSplitIns], m_pSndFile->m_szNames[i]);
+ else
+ wsprintf(s, "%02u: %s", i, m_pSndFile->m_szNames[i]);
+
UINT n = m_CbnInstrument.AddString(s);
if (n == m_nInstrument) nPos = n;
m_CbnInstrument.SetItemData(n, i);
@@ -482,7 +500,7 @@
if (m_CbnInstrument.GetItemData(i) == nIns)
{
m_CbnInstrument.SetCurSel(i);
- m_nInstrument = nIns;
+ m_nInstrument = static_cast<INSTRUMENTINDEX>(nIns);
//rewbs.instroVST
if (HasValidPlug(m_nInstrument))
::EnableWindow(::GetDlgItem(m_hWnd, IDC_PATINSTROPLUGGUI), true);
@@ -678,7 +696,7 @@
int nmax = (m_pSndFile->m_nInstruments) ? m_pSndFile->m_nInstruments : m_pSndFile->m_nSamples;
if ((n >= 0) && (n <= nmax) && (n != (int)m_nInstrument))
{
- m_nInstrument = n;
+ m_nInstrument = static_cast<INSTRUMENTINDEX>(n);
if (m_pParent) m_pParent->InstrumentChanged(m_nInstrument);
}
SwitchToView();
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -674,12 +674,13 @@
s[0] = 0;
if(CMainFrame::m_dwPatternSetup & PATTERN_HEXDISPLAY)
{
- wsprintf(s, "Position %02Xh of %02Xh", m_nScrollPos, pSndFile->GetNumPatterns());
+ wsprintf(s, "Position %02Xh of %02Xh", m_nScrollPos, pSndFile->Order.GetLengthFirstEmpty());
}
else
{
+ const ORDERINDEX nLength = pSndFile->Order.GetLengthFirstEmpty();
wsprintf(s, "Position %d of %d (%02Xh of %02Xh)",
- m_nScrollPos, pSndFile->GetNumPatterns(), m_nScrollPos, pSndFile->GetNumPatterns());
+ m_nScrollPos, nLength, m_nScrollPos, nLength);
}
if (m_nScrollPos < pSndFile->Order.GetLength())
Modified: trunk/OpenMPT/mptrack/Mod2wave.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mod2wave.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/Mod2wave.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -667,7 +667,7 @@
ULONGLONG l = ((ULONGLONG)m_pSndFile->GetSongTime()) * m_pWaveFormat->nSamplesPerSec;
if (m_nMaxPatterns > 0)
{
- DWORD dwOrds = m_pSndFile->GetNumPatterns();
+ DWORD dwOrds = m_pSndFile->Order.GetLengthFirstEmpty();
if ((m_nMaxPatterns < dwOrds) && (dwOrds > 0)) l = (l*m_nMaxPatterns) / dwOrds;
}
if (l < max) max = l;
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -22,12 +22,12 @@
static char THIS_FILE[] = __FILE__;
#endif
-const std::string FileFilterMOD = _T("ProTracker Modules (*.mod)|*.mod||");
-const std::string FileFilterXM = _T("FastTracker Modules (*.xm)|*.xm||");
-const std::string FileFilterS3M = _T("ScreamTracker Modules (*.s3m)|*.s3m||");
-const std::string FileFilterIT = _T("Impulse Tracker Modules (*.it)|*.it||");
-const std::string FileFilterITP = _T("Impulse Tracker Projects (*.itp)|*.itp||");
-const std::string FileFilterMPT = _T("OpenMPT Modules (*.mptm)|*.mptm||");
+const TCHAR FileFilterMOD[] = _T("ProTracker Modules (*.mod)|*.mod||");
+const TCHAR FileFilterXM[] = _T("FastTracker Modules (*.xm)|*.xm||");
+const TCHAR FileFilterS3M[] = _T("ScreamTracker Modules (*.s3m)|*.s3m||");
+const TCHAR FileFilterIT[] = _T("Impulse Tracker Modules (*.it)|*.it||");
+const TCHAR FileFilterITP[] = _T("Impulse Tracker Projects (*.itp)|*.itp||");
+const TCHAR FileFilterMPT[] = _T("OpenMPT Modules (*.mptm)|*.mptm||");
/////////////////////////////////////////////////////////////////////////////
// CModDoc
@@ -366,7 +366,7 @@
if (m_SndFile.m_dwLastSavedWithVersion > MptVersion::num) {
char s[256];
wsprintf(s, "Warning: this song was last saved with a more recent version of OpenMPT.\r\nSong saved with: v%s. Current version: v%s.\r\n",
- MptVersion::ToStr(m_SndFile.m_dwLastSavedWithVersion),
+ (LPCTSTR)MptVersion::ToStr(m_SndFile.m_dwLastSavedWithVersion),
MptVersion::str);
::AfxMessageBox(s);
}
@@ -3467,3 +3467,50 @@
pMainFrm->ResetElapsedTime();
}
+
+CString CModDoc::GetPatternViewInstrumentName(UINT nInstr,
+ bool bEmptyInsteadOfNoName /* = false*/,
+ bool bIncludeIndex /* = true*/) const
+//-----------------------------------------------------------------------------------
+{
+ if(nInstr >= MAX_INSTRUMENTS || m_SndFile.GetNumInstruments() == 0 || m_SndFile.Instruments[nInstr] == nullptr)
+ return TEXT("");
+
+ CString displayName, instrumentName, pluginName;
+
+ // Get instrument name.
+ instrumentName = m_SndFile.GetInstrumentName(nInstr);
+
+ // If instrument name is empty, use name of the sample mapped to C-5.
+ if (instrumentName.IsEmpty())
+ {
+ const SAMPLEINDEX nSmp = m_SndFile.Instruments[nInstr]->Keyboard[60];
+ if (nSmp < ARRAYELEMCOUNT(m_SndFile.Samples) && m_SndFile.Samples[nSmp].pSample)
+ instrumentName.Format(TEXT("s: %s"), (LPCTSTR)m_SndFile.GetSampleName(nSmp)); //60 is C-5
+ }
+
+ // Get plugin name.
+ const PLUGINDEX nPlug = m_SndFile.Instruments[nInstr]->nMixPlug;
+ if (nPlug > 0 && nPlug < MAX_MIXPLUGINS)
+ pluginName = m_SndFile.m_MixPlugins[nPlug-1].GetName();
+
+ if (pluginName.IsEmpty())
+ {
+ if(bEmptyInsteadOfNoName && instrumentName.IsEmpty())
+ return TEXT("");
+ if(instrumentName.IsEmpty())
+ instrumentName = TEXT("(no name)");
+ if (bIncludeIndex)
+ displayName.Format(TEXT("%02d: %s"), nInstr, (LPCTSTR)instrumentName);
+ else
+ displayName.Format(TEXT("%s"), (LPCTSTR)instrumentName);
+ } else
+ {
+ if (bIncludeIndex)
+ displayName.Format(TEXT("%02d: %s (%s)"), nInstr, (LPCTSTR)instrumentName, (LPCTSTR)pluginName);
+ else
+ displayName.Format(TEXT("%s (%s)"), (LPCTSTR)instrumentName, (LPCTSTR)pluginName);
+ }
+ return displayName;
+}
+
Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/Moddoc.h 2009-12-30 21:54:16 UTC (rev 452)
@@ -118,9 +118,15 @@
// Split Keyboard Settings (pattern editor)
#define SPLIT_OCTAVE_RANGE 9
+
+//==========================
struct SplitKeyboardSettings
+//==========================
{
- UINT splitInstrument, splitNote, splitVolume;
+ bool IsSplitActive() {return (octaveLink && (octaveModifier != 0)) || (splitInstrument > 0) || (splitVolume != 0);}
+ MODCOMMAND::NOTE splitNote;
+ MODCOMMAND::INSTR splitInstrument;
+ MODCOMMAND::VOL splitVolume;
int octaveModifier; // determines by how many octaves the notes should be transposed up or down
bool octaveLink; // apply octaveModifier
};
@@ -291,6 +297,12 @@
void OnFileWaveConvert(ORDERINDEX nMinOrder, ORDERINDEX nMaxOrder);
+ // Returns formatted MODINSTRUMENT name.
+ // [in] bEmptyInsteadOfNoName: In case of unnamed instrument string, "(no name)" is returned unless this
+ // parameter is true is case which an empty name is returned.
+ // [in] bIncludeIndex: True to include instrument index in front of the instrument name, false otherwise.
+ CString GetPatternViewInstrumentName(UINT nInstr, bool bEmptyInsteadOfNoName = false, bool bIncludeIndex = true) const;
+
// protected members
protected:
CSize m_szOldPatternScrollbarsPos;
Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/Modedit.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -1179,9 +1179,9 @@
MODTYPE origFormat = MOD_TYPE_IT;
UINT len = 0, startLen;
- bool doOverflowPaste = (CMainFrame::m_dwPatternSetup & PATTERN_OVERFLOWPASTE) && (pasteMode != pm_pasteflood) && (pasteMode != pm_pushforwardpaste);
- bool doITStyleMix = (pasteMode == pm_mixpaste_it);
- bool doMixPaste = ((pasteMode == pm_mixpaste) || doITStyleMix);
+ const bool doOverflowPaste = (CMainFrame::m_dwPatternSetup & PATTERN_OVERFLOWPASTE) && (pasteMode != pm_pasteflood) && (pasteMode != pm_pushforwardpaste);
+ const bool doITStyleMix = (pasteMode == pm_mixpaste_it);
+ const bool doMixPaste = ((pasteMode == pm_mixpaste) || doITStyleMix);
ORDERINDEX oCurrentOrder; //jojo.echopaste
ROWINDEX rTemp, startRow;
@@ -1234,14 +1234,23 @@
// Paste columns
while ((p[len] == '|') && (len + 11 < dwMemSize))
{
- // ITSyle mixpaste requires that we keep a copy of the thing we are about to paste on
- // so that we can refer back to check if there was anything in e.g. the note column before we pasted.
- MODCOMMAND origModCmd = m[col];
-
LPSTR s = p+len+1;
- if (col < m_SndFile.m_nChannels)
+ // Check valid paste condition. Paste will be skipped if
+ // -col is not a valid channelindex or
+ // -doing mix paste and paste destination modcommand is a PCnote or
+ // -doing mix paste and trying to paste PCnote on non-empty modcommand.
+ const bool bSkipPaste =
+ (col >= m_SndFile.GetNumChannels()) ||
+ (doMixPaste && m[col].IsPcNote()) ||
+ (doMixPaste && s[0] == 'P' && !m[col].IsEmpty());
+
+ if (bSkipPaste == false)
{
+ // ITSyle mixpaste requires that we keep a copy of the thing we are about to paste on
+ // so that we can refer back to check if there was anything in e.g. the note column before we pasted.
+ const MODCOMMAND origModCmd = m[col];
+
// push channel data below paste point first.
if(pasteMode == pm_pushforwardpaste)
{
@@ -1294,7 +1303,7 @@
{
if (s[5] != '.')
{
- if(m[col].note == NOTE_PCS || m[col].note == NOTE_PC)
+ if(m[col].IsPcNote())
{
char val[4];
memcpy(val, s+5, 3);
@@ -1317,9 +1326,9 @@
} else m[col].volcmd = m[col].vol = 0;
}
- if(m[col].note == NOTE_PCS || m[col].note == NOTE_PC)
+ if (m[col].IsPcNote())
{
- if(s[8] != '.' && s[8] > ' ')
+ if (s[8] != '.' && s[8] > ' ')
{
char val[4];
memcpy(val, s+8, 3);
@@ -1382,9 +1391,14 @@
}
}
}
+
+ // convert some commands, if necessary. With mix paste convert only
+ // if the original modcommand was empty as otherwise the unchanged parts
+ // of the old modcommand would falsely be interpreted being of type
+ // origFormat and ConvertCommand could change them.
+ if (origFormat != m_SndFile.m_nType && (doMixPaste == false || origModCmd.IsEmpty()))
+ m_SndFile.ConvertCommand(&(m[col]), origFormat, m_SndFile.m_nType);
}
- // convert some commands, if necessary.
- if(origFormat != m_SndFile.m_nType) m_SndFile.ConvertCommand(&(m[col]), origFormat, m_SndFile.m_nType);
len += 12;
col++;
Modified: trunk/OpenMPT/mptrack/View_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_pat.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/View_pat.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -3090,7 +3090,7 @@
// Need to convert to linear in [0;64] - see below
BYTE event = GetFromMIDIMsg_Event(dwMidiData);
- if ((event == 0x9) && !nVol) event = 0x8; //Convert event to note-off if req'd
+ if ((event == MIDIEVENT_NOTEON) && !nVol) event = MIDIEVENT_NOTEOFF; //Convert event to note-off if req'd
// Handle MIDI mapping.
@@ -3116,14 +3116,14 @@
switch(event)
{
- case 0x8: // Note Off
+ case MIDIEVENT_NOTEOFF: // Note Off
// The following method takes care of:
// . Silencing specific active notes (just setting nNote to 255 as was done before is not acceptible)
// . Entering a note off in pattern if required
TempStopNote(nNote, ((CMainFrame::m_dwMidiSetup & MIDISETUP_RECORDNOTEOFF) != 0));
break;
- case 0x9: // Note On
+ case MIDIEVENT_NOTEON: // Note On
nVol = ApplyVolumeRelatedMidiSettings(dwMidiData, midivolume);
if(nVol < 0) nVol = -1;
else nVol = (nVol + 3) / 4; //Value from [0,256] to [0,64]
@@ -3135,10 +3135,10 @@
break;
- case 0xB: //Controller change
+ case MIDIEVENT_CONTROLLERCHANGE: //Controller change
switch(nByte1)
{
- case 0x7: //Volume
+ case MIDICC_Volume_Coarse: //Volume
midivolume = nByte2;
break;
}
@@ -4934,8 +4934,10 @@
HMENU instrumentChangeMenu = ::CreatePopupMenu();
AppendMenu(hMenu, MF_POPUP|greyed, (UINT)instrumentChangeMenu, "Change Instrument\t" + ih->GetKeyTextFromCommand(kcPatternSetInstrument));
- if(pSndFile == NULL)
+ if(pSndFile == nullptr || pSndFile->GetpModDoc() == nullptr)
return false;
+
+ CModDoc* const pModDoc = pSndFile->GetpModDoc();
if(!greyed)
{
@@ -4946,8 +4948,8 @@
if (pSndFile->Instruments[i] == NULL)
continue;
- CString instString = pSndFile->GetPatternViewInstrumentName(i, true);
- if(instString.GetLength() > 0) AppendMenu(instrumentChangeMenu, MF_STRING, ID_CHANGE_INSTRUMENT+i, pSndFile->GetPatternViewInstrumentName(i));
+ CString instString = pModDoc->GetPatternViewInstrumentName(i, true);
+ if(instString.GetLength() > 0) AppendMenu(instrumentChangeMenu, MF_STRING, ID_CHANGE_INSTRUMENT+i, pModDoc->GetPatternViewInstrumentName(i));
//Adding the entry to the list only if it has some name, since if the name is empty,
//it likely is some non-used instrument.
}
@@ -5213,7 +5215,8 @@
if(pSndFile == nullptr) return;
CSplitKeyboadSettings dlg(CMainFrame::GetMainFrame(), pSndFile, pModDoc->GetSplitKeyboardSettings());
- dlg.DoModal();
+ if (dlg.DoModal() == IDOK)
+ pModDoc->UpdateAllViews(NULL, HINT_INSNAMES|HINT_SMPNAMES);
}
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -1948,7 +1948,7 @@
end=NMACROS;
}
- for (UINT m=0; m<NMACROS; m++) {
+ for (int m=0; m<NMACROS; m++) {
//SFx
s.Format("SF%X", m);
m_EditMacro[m].SetWindowText(s);
@@ -1956,7 +1956,7 @@
//Macro value:
CString macroText = &m_MidiCfg.szMidiSFXExt[m*32];
m_EditMacroValue[m].SetWindowText(macroText);
- m_EditMacroValue[m].SetBackColor(m==selectedMacro?RGB(200,200,225) : RGB(245,245,245) );
+ m_EditMacroValue[m].SetBackColor(m == selectedMacro ? RGB(200,200,225) : RGB(245,245,245) );
//Macro Type:
macroType = m_pModDoc->GetMacroType(macroText);
@@ -1977,7 +1977,7 @@
default: s = "Custom";
}
m_EditMacroType[m].SetWindowText(s);
- m_EditMacroType[m].SetBackColor(m==selectedMacro?RGB(200,200,225) : RGB(245,245,245) );
+ m_EditMacroType[m].SetBackColor(m == selectedMacro ? RGB(200,200,225) : RGB(245,245,245) );
//Param details button:
if (macroType == sfx_plug)
@@ -2698,7 +2698,7 @@
BOOL CSplitKeyboadSettings::OnInitDialog()
//----------------------------------------
{
- if(!m_pSndFile) return FALSE;
+ if(!m_pSndFile || m_pSndFile->GetpModDoc() == nullptr) return FALSE;
CDialog::OnInitDialog();
@@ -2739,7 +2739,7 @@
continue;
}
- CString displayName = m_pSndFile->GetPatternViewInstrumentName(nIns);
+ CString displayName = m_pSndFile->GetpModDoc()->GetPatternViewInstrumentName(nIns);
int n = m_CbnSplitInstrument.AddString(displayName);
m_CbnSplitInstrument.SetItemData(n, nIns);
}
@@ -2876,7 +2876,7 @@
}
if (bUsed) {
CString sampleName;
- sampleName.Format("%d: %s", i, m_pSndFile->GetSampleName(i));
+ sampleName.Format("%d: %s", i, (LPCTSTR)m_pSndFile->GetSampleName(i));
nInsertPos = m_CbnSample.AddString(sampleName);
m_CbnSample.SetItemData(nInsertPos, i);
Modified: trunk/OpenMPT/mptrack/fxp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/fxp.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/fxp.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -232,7 +232,7 @@
{
::AfxMessageBox(e->m_strFileName);
char s[256];
- wsprintf(s, "%lx: %d; %d; %s;", e, e->m_cause, e->m_lOsError, e->m_strFileName);
+ wsprintf(s, "%lx: %d; %d; %s;", e, e->m_cause, e->m_lOsError, (LPCTSTR)e->m_strFileName);
::AfxMessageBox(s);
e->Delete();
}
Modified: trunk/OpenMPT/mptrack/misc_util.cpp
===================================================================
--- trunk/OpenMPT/mptrack/misc_util.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/misc_util.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -3,10 +3,10 @@
/*
* Loads resource.
- * lpName and lpType: parameters passed to FindResource().
- * pData: Pointer to loaded resource data, nullptr if load not successful.
- * nSize: Size of the data in bytes, zero if load not succesfull.
- * hglob: HGLOBAL returned by LoadResource-function.
+ * [in] lpName and lpType: parameters passed to FindResource().
+ * [out] pData: Pointer to loaded resource data, nullptr if load not successful.
+ * [out] nSize: Size of the data in bytes, zero if load not succesfull.
+ * [out] hglob: HGLOBAL returned by LoadResource-function.
* Return: pData.
*/
LPCCH LoadResource(LPCTSTR lpName, LPCTSTR lpType, LPCCH& pData, size_t& nSize, HGLOBAL& hglob)
Modified: trunk/OpenMPT/mptrack/misc_util.h
===================================================================
--- trunk/OpenMPT/mptrack/misc_util.h 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/misc_util.h 2009-12-30 21:54:16 UTC (rev 452)
@@ -5,11 +5,6 @@
#include <string>
#include <limits>
-#define ARRAYELEMCOUNT(x) (sizeof(x)/sizeof(x[0]))
-
-//Compile time assert.
-#define STATIC_ASSERT(expr) C_ASSERT(expr)
-
//Convert object(typically number) to string
template<class T>
inline std::string Stringify(const T& x)
Modified: trunk/OpenMPT/mptrack/typedefs.h
===================================================================
--- trunk/OpenMPT/mptrack/typedefs.h 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/mptrack/typedefs.h 2009-12-30 21:54:16 UTC (rev 452)
@@ -2,7 +2,13 @@
#define TYPEDEFS_H
#define nullptr 0
+#define ARRAYELEMCOUNT(x) (sizeof(x)/sizeof(x[0]))
+//Compile time assert.
+#define STATIC_ASSERT(expr) C_ASSERT(expr)
+#define static_assert(expr, msg) C_ASSERT(expr)
+
+
typedef __int8 int8;
typedef __int16 int16;
typedef __int32 int32;
Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp 2009-12-30 21:54:16 UTC (rev 452)
@@ -786,7 +786,9 @@
if (m_nType)
{
SetModSpecsPointer(m_pModSpecs, m_nType);
- Order.resize(GetModSpecifications().ordersMax);
+ const ORDERINDEX nMinLength = (std::min)(ModSequenceSet::s_nCacheSize, GetModSpecifications().ordersMax);
+ if (Order.GetLength() < nMinLength)
+ Order.resize(nMinLength);
return TRUE;
}
@@ -1056,14 +1058,6 @@
}
-ORDERINDEX CSoundFile::GetNumPatterns() const
-//-------------------------------------
-{
- ORDERINDEX i = 0;
- while ((i < Order.size()) && (Order[i] < Order.GetInvalidPatIndex())) i++;
- return i;
-}
-
/*
UINT CSoundFile::GetNumInstruments() const
//----------------------------------------
@@ -1422,12 +1416,18 @@
CString CSoundFile::GetInstrumentName(UINT nInstr) const
-//-----------------------------------------------------------
+//------------------------------------------------------
{
- if ((nInstr >= MAX_INSTRUMENTS) || (!Instruments[nInstr])) {
- return "";
- }
- return Instruments[nInstr]->name;
+ if ((nInstr >= MAX_INSTRUMENTS) || (!Instruments[nInstr]))
+ return TEXT("");
+
+ const size_t nSize = ARRAYELEMCOUNT(Instruments[nInstr]->name);
+ CString str;
+ LPTSTR p = str.GetBuffer(nSize + 1);
+ ArrayCopy(p, Instruments[nInstr]->name, nSize);
+ p[nSize] = 0;
+ str.ReleaseBuffer();
+ return str;
}
@@ -1669,42 +1669,6 @@
}
-CString CSoundFile::GetPatternViewInstrumentName(UINT nInstr, bool returnEmptyInsteadOfNoName) const
-//-----------------------------------------------------------------
-{
- //Default: returnEmptyInsteadOfNoName = false;
- if(nInstr >= MAX_INSTRUMENTS || m_nInstruments == 0 || Instruments[nInstr] == 0) return "";
-
- CString displayName, instrumentName, pluginName = "";
-
- // Use instrument name
- instrumentName.Format("%s", Instruments[nInstr]->name);
-
- if (instrumentName == "") {
- // if there's no instrument name, use name of sample associated with C-5.
- //TODO: If there's no sample mapped to that note, we could check the other notes.
- if (Instruments[nInstr]->Keyboard[60] && Samples[Instruments[nInstr]->Keyboard[60]].pSample) {
- instrumentName.Format("s: %s", m_szNames[Instruments[nInstr]->Keyboard[60]]); //60 is C-5
- }
- }
-
- //Get plugin name:
- UINT nPlug=Instruments[nInstr]->nMixPlug;
- if (nPlug>0 && nPlug<MAX_MIXPLUGINS) {
- pluginName = m_MixPlugins[nPlug-1].Info.szName;
- }
-
- if (pluginName == "") {
- if(returnEmptyInsteadOfNoName && instrumentName == "") return "";
- if(instrumentName == "") instrumentName = "(no name)";
- displayName.Format("%02d: %s", nInstr, instrumentName);
- } else {
- displayName.Format("%02d: %s (%s)", nInstr, instrumentName, pluginName);
- }
- return displayName;
-}
-
-
#ifndef NO_PACKING
UINT CSoundFile::PackSample(int &sample, int next)
//------------------------------------------------
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2009-12-30 21:54:16 UTC (rev 452)
@@ -653,7 +653,6 @@
LPCSTR GetTitle() const { return m_szNames[0]; }
CString GetSampleName(UINT nSample) const;
CString GetInstrumentName(UINT nInstr) const;
- CString GetPatternViewInstrumentName(UINT nInstr, bool returnEmptyInsteadOfNoName = false) const;
UINT GetMusicSpeed() const { return m_nMusicSpeed; }
UINT GetMusicTempo() const { return m_nMusicTempo; }
@@ -746,7 +745,7 @@
void S3MSaveConvert(UINT *pcmd, UINT *pprm, BOOL bIT, BOOL bCompatibilityExport = false) const;
WORD ModSaveCommand(const MODCOMMAND *m, const bool bXM, const bool bCompatibilityExport = false) const;
- static void ConvertCommand(MODCOMMAND *m, MODTYPE nOldType, MODTYPE nNewType); // Convert a complete MODCHANNEL item from one format to another
+ static void ConvertCommand(MODCOMMAND *m, MODTYPE nOldType, MODTYPE nNewType); // Convert a complete MODCOMMAND item from one format to another
static void MODExx2S3MSxx(MODCOMMAND *m); // Convert Exx to Sxx
static void S3MSxx2MODExx(MODCOMMAND *m); // Convert Sxx to Exx
Modified: trunk/OpenMPT/soundlib/modcommand.h
===================================================================
--- trunk/OpenMPT/soundlib/modcommand.h 2009-12-28 02:57:57 UTC (rev 451)
+++ trunk/OpenMPT/soundlib/modcommand.h 2009-12-30 21:54:16 UTC (rev 452)
@@ -54,8 +54,11 @@
bool IsEmpty() const {return (*this == Empty());}
// Returns true if instrument column represents plugin index.
- bool IsInstrPlug() const {return note == NOTE_PC || note == NOTE_PCS;}
+ bool IsInstrPlug() const {return IsPcNote();}
+ // Returns true if and only if note is NOTE_PC or NOTE_PCS.
+ bool IsPcNote() const {return note == NOTE_PC || note == NOTE_PCS;}
+
public:
BYTE note;
BYTE instr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
3 messages has been excluded from this view by a project administrator.
