Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[1483] trunk/OpenMPT
|
From: <sag...@us...> - 2013-01-07 14:56:37
|
Revision: 1483
http://sourceforge.net/p/modplug/code/1483
Author: saga-games
Date: 2013-01-07 14:56:30 +0000 (Mon, 07 Jan 2013)
Log Message:
-----------
[Fix] DLS: Tenative fix for some DLS sounds not loading correctly (http://bugs.openmpt.org/view.php?id=331)
[Mod] 2013
[Mod] OpenMPT: Version is now 1.21.01.04
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/res/MPTRACK.RC2
trunk/OpenMPT/mptrack/version.h
trunk/OpenMPT/soundlib/Dlsbank.cpp
trunk/OpenMPT/soundlib/LOAD_DMF.CPP
trunk/OpenMPT/soundlib/Load_stm.cpp
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2013-01-04 13:35:16 UTC (rev 1482)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2013-01-07 14:56:30 UTC (rev 1483)
@@ -1592,11 +1592,11 @@
static const char* const pArrCredit =
{
"OpenMPT / ModPlug Tracker|"
- "Copyright \xA9 2004-2012 Contributors|"
+ "Copyright \xA9 2004-2013 Contributors|"
"Copyright \xA9 1997-2003 Olivier Lapicque|"
"|"
"Contributors:|"
- "Johannes Schultz (2008-2012)|"
+ "Johannes Schultz (2008-2013)|"
"Ahti Lepp\xE4nen (2005-2011)|"
"Robin Fernandes (2004-2007)|"
"Sergiy Pylypenko (2007)|"
@@ -1639,7 +1639,7 @@
"|||||||"
"VST PlugIn Technology by Steinberg Media Technologies GmbH|"
"ASIO Technology by Steinberg Media Technologies GmbH|"
- "||||||"
+ "||||||"
};
m_static.SubclassDlgItem(IDC_CREDITS,this);
Modified: trunk/OpenMPT/mptrack/res/MPTRACK.RC2
===================================================================
--- trunk/OpenMPT/mptrack/res/MPTRACK.RC2 2013-01-04 13:35:16 UTC (rev 1482)
+++ trunk/OpenMPT/mptrack/res/MPTRACK.RC2 2013-01-07 14:56:30 UTC (rev 1483)
@@ -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-2012 contributors."
+ VALUE "LegalCopyright", "Copyright \xA91997-2003 Olivier Lapicque; \xA92004-2013 contributors."
VALUE "LegalTrademarks", "M.O.D.P.L.U.G"
VALUE "OriginalFilename", "mptrack.exe"
VALUE "PrivateBuild", ""
Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h 2013-01-04 13:35:16 UTC (rev 1482)
+++ trunk/OpenMPT/mptrack/version.h 2013-01-07 14:56:30 UTC (rev 1483)
@@ -19,7 +19,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 21
#define VER_MINOR 01
-#define VER_MINORMINOR 03
+#define VER_MINORMINOR 04
//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/Dlsbank.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Dlsbank.cpp 2013-01-04 13:35:16 UTC (rev 1482)
+++ trunk/OpenMPT/soundlib/Dlsbank.cpp 2013-01-07 14:56:30 UTC (rev 1483)
@@ -1740,7 +1740,7 @@
}
}
// Create a new sample
- if (pRgn->nWaveLink == 0) nSmp = 0; else
+ //if (pRgn->nWaveLink == 0) nSmp = 0; else
if (!bDupRgn)
{
UINT nmaxsmp = (m_nType & MOD_TYPE_XM) ? 16 : 32;
Modified: trunk/OpenMPT/soundlib/LOAD_DMF.CPP
===================================================================
--- trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-01-04 13:35:16 UTC (rev 1482)
+++ trunk/OpenMPT/soundlib/LOAD_DMF.CPP 2013-01-07 14:56:30 UTC (rev 1483)
@@ -5,7 +5,7 @@
* Notes : If it wasn't already outdated when the tracker was released, this would be a rather interesting
* and in some parts even sophisticated format - effect columns are separated by effect type, an easy to
* understand BPM tempo mode, effect durations are always divided into a 256th row, vibrato effects are
- * specified by period length and the same 8-Bit granularity is used for both volume and panning.
+ * specified by period length and the same 8-Bit granularity is used for both volume and panning.
* Unluckily, this format does not offer any envelopes or multi-sample instruments, and bidi sample loops
* are missing as well, so it was already well behind FT2 and IT back then.
* Authors: Johannes Schultz (mostly based on DMF.TXT, DMF_EFFC.TXT, trial and error and some invaluable hints by Zatzen)
@@ -120,14 +120,14 @@
// Pattern translation memory
struct DMF_PATTERNSETTINGS
{
+ vector<ModCommand::NOTE> noteBuffer; // Note buffer
+ vector<ModCommand::NOTE> lastNote; // Last played note on channel
+ vector<bool> playDir; // Sample play direction of each channel... false = forward (default)
+ bool realBPMmode; // true = BPM mode
uint8 beat; // Rows per beat
uint8 tempoTicks; // Tick mode param
uint8 tempoBPM; // BPM mode param
- bool realBPMmode; // true = BPM mode
uint8 internalTicks; // Ticks per row in final pattern
- vector<bool> playDir; // Sample play direction of each channel... false = forward (default)
- vector<ModCommand::NOTE> noteBuffer; // Note buffer
- vector<ModCommand::NOTE> lastNote; // Last played note on channel
};
Modified: trunk/OpenMPT/soundlib/Load_stm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_stm.cpp 2013-01-04 13:35:16 UTC (rev 1482)
+++ trunk/OpenMPT/soundlib/Load_stm.cpp 2013-01-07 14:56:30 UTC (rev 1483)
@@ -212,12 +212,10 @@
switch(m->command)
{
case CMD_SPEED:
- // I don't know how Axx really works, but I do know that this
- // isn't it. It does all sorts of mindbogglingly screwy things:
- // 01 - very fast,
- // 0F - very slow.
- // 10 - fast again!
- // I don't get it.
+ // ST2 assumes that the tempo is 125 * 16 BPM, and effects are updated
+ // on every 16th tick of a row. This is pretty hard to handle, so we just
+ // assume the tempo is 125 and divide the speed by 16 instead.
+ // Parameters below 10 might behave weird.
m->param >>= 4;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
