Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1035] trunk/OpenMPT
|
From: <sag...@us...> - 2011-09-17 15:59:12
|
Revision: 1035
http://modplug.svn.sourceforge.net/modplug/?rev=1035&view=rev
Author: saga-games
Date: 2011-09-17 15:59:05 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
[Imp (?)] Reordered MODINSTRUMENT members for theoretically better caching.
[Mod] Installer: Updated hashs / download locations for unmo3 2.4.0.3
[Mod] OpenMPT: Version is now 1.20.00.22
Modified Paths:
--------------
trunk/OpenMPT/installer/install-unmo3-free-itd.iss
trunk/OpenMPT/installer/install-unmo3-free.iss
trunk/OpenMPT/mptrack/version.h
trunk/OpenMPT/soundlib/Snd_defs.h
trunk/OpenMPT/soundlib/Sndfile.h
Modified: trunk/OpenMPT/installer/install-unmo3-free-itd.iss
===================================================================
--- trunk/OpenMPT/installer/install-unmo3-free-itd.iss 2011-09-17 15:42:37 UTC (rev 1034)
+++ trunk/OpenMPT/installer/install-unmo3-free-itd.iss 2011-09-17 15:59:05 UTC (rev 1035)
@@ -21,9 +21,9 @@
begin
if(IsTaskSelected('downloadmo3') And FileExists(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'))) then
begin
- if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> 'f8ec44e0a089f17ddd6333956ecc37cd8081e7e8') then
+ if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> '79de7b1476bbde064951c6946cf315a2') then
begin
- MsgBox('Warning: unmo3.dll has been downloaded, but its checksum is wrong! This means that either the downloaded file is corrupted or that a newer version of unmo3.dll is available. The file has thus not been installed. Please obtain unmo3.dll from http://openmpt.org/ and verify its checksum.', mbCriticalError, MB_OK)
+ MsgBox('Warning: unmo3.dll has been downloaded, but its checksum is wrong! This means that the downloaded file might corrupted or manipulated. The file has thus not been installed. Please obtain unmo3.dll from http://openmpt.org/ and verify its checksum.', mbCriticalError, MB_OK)
end else
begin
FileCopy(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'), ExpandConstant('{app}\unmo3.dll'), true);
@@ -46,7 +46,7 @@
begin
if(IsTaskSelected('downloadmo3')) then
begin
- ITD_AddFile('http://openmpt.org/files/unmo3/2.4.0.2/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
+ ITD_AddFile('http://openmpt.org/files/unmo3/2.4.0.3/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
ITD_AddMirror('ftp://ftp.untergrund.net/users/sagamusix/openmpt/unmo3.dll', ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'));
end else
begin
Modified: trunk/OpenMPT/installer/install-unmo3-free.iss
===================================================================
--- trunk/OpenMPT/installer/install-unmo3-free.iss 2011-09-17 15:42:37 UTC (rev 1034)
+++ trunk/OpenMPT/installer/install-unmo3-free.iss 2011-09-17 15:59:05 UTC (rev 1035)
@@ -13,16 +13,16 @@
#include "install.iss"
[_ISToolDownload]
-Source: http://openmpt.org/files/unmo3/2.4.0.2/unmo3.dll; DestDir: {tmp}; DestName: openmpt-unmo3.dll.tmp; Tasks: downloadmo3
+Source: http://openmpt.org/files/unmo3/2.4.0.3/unmo3.dll; DestDir: {tmp}; DestName: openmpt-unmo3.dll.tmp; Tasks: downloadmo3
[Code]
// Verify checksum of downloaded file, and if it is OK, copy it to the app directory.
procedure VerifyUNMO3Checksum();
begin
if(IsTaskSelected('downloadmo3') And FileExists(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'))) then
begin
- if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> 'f8ec44e0a089f17ddd6333956ecc37cd8081e7e8') then
+ if(GetSHA1OfFile(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp')) <> '79de7b1476bbde064951c6946cf315a2') then
begin
- MsgBox('Warning: unmo3.dll has been downloaded, but its checksum is wrong! This means that either the downloaded file is corrupted or that a newer version of unmo3.dll is available. The file has thus not been installed. Please obtain unmo3.dll from http://openmpt.org/ and verify its checksum.', mbCriticalError, MB_OK)
+ MsgBox('Warning: unmo3.dll has been downloaded, but its checksum is wrong! This means that the downloaded file might corrupted or manipulated. The file has thus not been installed. Please obtain unmo3.dll from http://openmpt.org/ and verify its checksum.', mbCriticalError, MB_OK)
end else
begin
FileCopy(ExpandConstant('{tmp}\openmpt-unmo3.dll.tmp'), ExpandConstant('{app}\unmo3.dll'), true);
Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h 2011-09-17 15:42:37 UTC (rev 1034)
+++ trunk/OpenMPT/mptrack/version.h 2011-09-17 15:59:05 UTC (rev 1035)
@@ -15,7 +15,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 20
#define VER_MINOR 00
-#define VER_MINORMINOR 21
+#define VER_MINORMINOR 22
//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/soundlib/Snd_defs.h
===================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h 2011-09-17 15:42:37 UTC (rev 1034)
+++ trunk/OpenMPT/soundlib/Snd_defs.h 2011-09-17 15:59:05 UTC (rev 1035)
@@ -78,11 +78,14 @@
#define MAX_ENVPOINTS 240
#define MIN_PERIOD 0x0020
#define MAX_PERIOD 0xFFFF
+
// String lengths (including trailing null char)
-#define MAX_SAMPLENAME 32 // also affects module name!
-#define MAX_SAMPLEFILENAME 22
-#define MAX_PATTERNNAME 32
-#define MAX_CHANNELNAME 20
+#define MAX_SAMPLENAME 32 // also affects module name!
+#define MAX_SAMPLEFILENAME 22
+#define MAX_INSTRUMENTNAME 32
+#define MAX_INSTRUMENTFILENAME 32
+#define MAX_PATTERNNAME 32
+#define MAX_CHANNELNAME 20
#define MAX_EQ_BANDS 6
Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h 2011-09-17 15:42:37 UTC (rev 1034)
+++ trunk/OpenMPT/soundlib/Sndfile.h 2011-09-17 15:59:05 UTC (rev 1035)
@@ -86,42 +86,35 @@
struct INSTRUMENTENVELOPE
{
DWORD dwFlags; // envelope flags
- WORD Ticks[MAX_ENVPOINTS]; // envelope point position (x axis)
- BYTE Values[MAX_ENVPOINTS]; // envelope point value (y axis)
UINT nNodes; // amount of nodes used
BYTE nLoopStart; // loop start node
BYTE nLoopEnd; // loop end node
BYTE nSustainStart; // sustain start node
BYTE nSustainEnd; // sustain end node
BYTE nReleaseNode; // release node
+ WORD Ticks[MAX_ENVPOINTS]; // envelope point position (x axis)
+ BYTE Values[MAX_ENVPOINTS]; // envelope point value (y axis)
INSTRUMENTENVELOPE()
{
dwFlags = 0;
- MemsetZero(Ticks);
- MemsetZero(Values);
nNodes = 0;
nLoopStart = nLoopEnd = 0;
nSustainStart = nSustainEnd = 0;
nReleaseNode = ENV_RELEASE_NODE_UNSET;
+ MemsetZero(Ticks);
+ MemsetZero(Values);
}
};
// Instrument Struct
struct MODINSTRUMENT
{
- UINT nFadeOut; // Instrument fadeout speed
- DWORD dwFlags; // Instrument flags
- UINT nGlobalVol; // Global volume (all sample volumes are multiplied with this)
- UINT nPan; // Default pan (overrides sample panning), if the appropriate flag is set
+ UINT nFadeOut; // Instrument fadeout speed
+ DWORD dwFlags; // Instrument flags
+ UINT nGlobalVol; // Global volume (all sample volumes are multiplied with this)
+ UINT nPan; // Default pan (overrides sample panning), if the appropriate flag is set
- INSTRUMENTENVELOPE VolEnv; // Volume envelope data
- INSTRUMENTENVELOPE PanEnv; // Panning envelope data
- INSTRUMENTENVELOPE PitchEnv; // Pitch / filter envelope data
-
- BYTE NoteMap[128]; // Note mapping, f.e. C-5 => D-5.
- WORD Keyboard[128]; // Sample mapping, f.e. C-5 => Sample 1
-
BYTE nNNA; // New note action
BYTE nDCT; // Duplicate check type (i.e. which condition will trigger the duplicate note action)
BYTE nDNA; // Duplicate note action
@@ -138,9 +131,6 @@
signed char nPPS; //Pitch/Pan separation (i.e. how wide the panning spreads)
unsigned char nPPC; //Pitch/Pan centre
- CHAR name[32]; // Note: not guaranteed to be null-terminated.
- CHAR filename[32];
-
PLUGINDEX nMixPlug; // Plugin assigned to this instrument
uint16 nVolRampUp; // Default sample ramping up
UINT nResampling; // Resampling mode
@@ -150,13 +140,23 @@
WORD wPitchToTempoLock; // BPM at which the samples assigned to this instrument loop correctly
BYTE nPluginVelocityHandling; // How to deal with plugin velocity
BYTE nPluginVolumeHandling; // How to deal with plugin volume
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// WHEN adding new members here, ALSO update Sndfile.cpp (instructions near the top of this file)!
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ CTuning *pTuning; // sample tuning assigned to this instrument
+ static CTuning *s_DefaultTuning;
- CTuning* pTuning; // sample tuning assigned to this instrument
- static CTuning* s_DefaultTuning;
+ INSTRUMENTENVELOPE VolEnv; // Volume envelope data
+ INSTRUMENTENVELOPE PanEnv; // Panning envelope data
+ INSTRUMENTENVELOPE PitchEnv; // Pitch / filter envelope data
+ BYTE NoteMap[128]; // Note mapping, f.e. C-5 => D-5.
+ SAMPLEINDEX Keyboard[128]; // Sample mapping, f.e. C-5 => Sample 1
+
+ CHAR name[MAX_INSTRUMENTNAME]; // Note: not guaranteed to be null-terminated.
+ CHAR filename[MAX_INSTRUMENTFILENAME];
+
+ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ // WHEN adding new members here, ALSO update Sndfile.cpp (instructions near the top of this file)!
+ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
void SetTuning(CTuning* pT)
{
pTuning = pT;
@@ -169,12 +169,6 @@
nGlobalVol = 64;
nPan = 32 * 4;
- for(size_t n = 0; n < CountOf(Keyboard); n++)
- {
- Keyboard[n] = (WORD)sample;
- NoteMap[n] = (BYTE)(n + 1);
- }
-
nNNA = NNA_NOTECUT;
nDCT = DCT_NONE;
nDNA = DNA_NOTECUT;
@@ -192,9 +186,6 @@
nPPC = NOTE_MIDDLEC - 1;
nPPS = 0;
- MemsetZero(name);
- MemsetZero(filename);
-
nMixPlug = 0;
nVolRampUp = 0;
nResampling = SRCMODE_DEFAULT;
@@ -206,6 +197,15 @@
nPluginVolumeHandling = PLUGIN_VOLUMEHANDLING_IGNORE;
pTuning = s_DefaultTuning;
+
+ for(size_t n = 0; n < CountOf(Keyboard); n++)
+ {
+ Keyboard[n] = sample;
+ NoteMap[n] = (BYTE)(n + 1);
+ }
+
+ MemsetZero(name);
+ MemsetZero(filename);
}
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
