Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[634] trunk/OpenMPT
|
From: <sag...@us...> - 2010-07-01 21:47:40
|
Revision: 634
http://modplug.svn.sourceforge.net/modplug/?rev=634&view=rev
Author: saga-games
Date: 2010-07-01 21:47:33 +0000 (Thu, 01 Jul 2010)
Log Message:
-----------
[Fix] S3M Compatibility: SD0 was not ignored properly when there was a row delay effect on the same row. Now it should be ignored in any case.
[Imp] Treeview: Don't ask for deleting for order items, as it was a bit annoying restoring them isn't a difficult task anyway.
[Imp] Sample Editor: When using the spin buttons for finetune, the finetune value is always in/decreased by 16 in MOD format. Not perfect yet, but at least better than before.
[Mod] Changes some keyboard manager shortcut names
[Mod] OpenMPT: Version is now 1.18.02.02
[Ref] Some minor code changes
Modified Paths:
--------------
trunk/OpenMPT/mptrack/CommandSet.cpp
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/Ctrl_smp.cpp
trunk/OpenMPT/mptrack/View_tre.cpp
trunk/OpenMPT/mptrack/version.h
trunk/OpenMPT/soundlib/Load_gdm.cpp
trunk/OpenMPT/soundlib/Snd_fx.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
Modified: trunk/OpenMPT/mptrack/CommandSet.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CommandSet.cpp 2010-06-26 14:04:46 UTC (rev 633)
+++ trunk/OpenMPT/mptrack/CommandSet.cpp 2010-07-01 21:47:33 UTC (rev 634)
@@ -1822,7 +1822,7 @@
commands[kcFileSaveAsMP3].isDummy = false;
commands[kcFileSaveMidi].UID = 1353;
- commands[kcFileSaveMidi].Message = "File/Export to Midi";
+ commands[kcFileSaveMidi].Message = "File/Export as MIDI";
commands[kcFileSaveMidi].isHidden = false;
commands[kcFileSaveMidi].isDummy = false;
@@ -2266,7 +2266,7 @@
commands[kcChangeLoopStatus].Message = "Toggle loop pattern";
commands[kcFileExportCompat].UID = 1777;
- commands[kcFileExportCompat].Message = "File/Export to standard IT/XM";
+ commands[kcFileExportCompat].Message = "File/Export to standard IT/XM/S3M";
commands[kcFileExportCompat].isHidden = false;
commands[kcFileExportCompat].isDummy = false;
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2010-06-26 14:04:46 UTC (rev 633)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2010-07-01 21:47:33 UTC (rev 634)
@@ -316,7 +316,7 @@
pSndFile->m_nCurrentPattern = m_nScrollPos;
pSndFile->SetCurrentOrder(m_nScrollPos);
pSndFile->m_dwSongFlags |= dwPaused;
- if (!(dwPaused & SONG_PATTERNLOOP)) pSndFile->GetLength(TRUE);
+ if (!(dwPaused & SONG_PATTERNLOOP)) pSndFile->GetLength(TRUE); // update channel parameters
if (bIsPlaying) pMainFrm->ResetNotificationBuffer();
END_CRITICAL();
}
Modified: trunk/OpenMPT/mptrack/Ctrl_smp.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-06-26 14:04:46 UTC (rev 633)
+++ trunk/OpenMPT/mptrack/Ctrl_smp.cpp 2010-07-01 21:47:33 UTC (rev 634)
@@ -2956,7 +2956,7 @@
m_EditFineTune.SetWindowText(s);
} else
{
- LONG d = CLAMP(pSmp->nFineTune + pos, -128, 127);
+ LONG d = CLAMP(pSmp->nFineTune + pos * ((m_pSndFile->GetType() & MOD_TYPE_MOD) ? 16 : 1), -128, 127);
pSmp->nFineTune = (signed char)d;
wsprintf(s, "%d", d);
m_EditFineTune.SetWindowText(s);
Modified: trunk/OpenMPT/mptrack/View_tre.cpp
===================================================================
--- trunk/OpenMPT/mptrack/View_tre.cpp 2010-06-26 14:04:46 UTC (rev 633)
+++ trunk/OpenMPT/mptrack/View_tre.cpp 2010-07-01 21:47:33 UTC (rev 634)
@@ -1411,8 +1411,6 @@
break;
case MODITEM_ORDER:
- wsprintf(s, _T("Delete order %d?"), modItemID & 0xFFFF);
- if(MessageBox(s, _T("Confirmation"), MB_YESNO | MB_DEFBUTTON2) == IDNO) break;
if ((pModDoc) && (pModDoc->RemoveOrder((SEQUENCEINDEX)(modItemID >> 16), (ORDERINDEX)(modItemID & 0xFFFF))))
{
pModDoc->UpdateAllViews(NULL, HINT_MODSEQUENCE, NULL);
Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h 2010-06-26 14:04:46 UTC (rev 633)
+++ trunk/OpenMPT/mptrack/version.h 2010-07-01 21:47:33 UTC (rev 634)
@@ -15,7 +15,7 @@
#define VER_MAJORMAJOR 1
#define VER_MAJOR 18
#define VER_MINOR 02
-#define VER_MINORMINOR 01
+#define VER_MINORMINOR 02
//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/Load_gdm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_gdm.cpp 2010-06-26 14:04:46 UTC (rev 633)
+++ trunk/OpenMPT/soundlib/Load_gdm.cpp 2010-07-01 21:47:33 UTC (rev 634)
@@ -71,8 +71,7 @@
#pragma pack()
-#define GDMHeader_Origin_Count 9
-static MODTYPE GDMHeader_Origin[GDMHeader_Origin_Count] =
+static MODTYPE GDMHeader_Origin[] =
{
MOD_TYPE_NONE, MOD_TYPE_MOD, MOD_TYPE_MTM, MOD_TYPE_S3M, MOD_TYPE_669, MOD_TYPE_FAR, MOD_TYPE_ULT, MOD_TYPE_STM, MOD_TYPE_MED
};
@@ -94,7 +93,7 @@
return false;
// 1-MOD, 2-MTM, 3-S3M, 4-669, 5-FAR, 6-ULT, 7-STM, 8-MED
- m_nType = GDMHeader_Origin[pHeader->FormOrigin % GDMHeader_Origin_Count];
+ m_nType = GDMHeader_Origin[pHeader->FormOrigin % ARRAYELEMCOUNT(GDMHeader_Origin)];
if(m_nType == MOD_TYPE_NONE)
return false;
@@ -175,7 +174,7 @@
Samples[iSmp].nLoopEnd = min(LittleEndian(pSample->LoopEnd) - 1, Samples[iSmp].nLength); // dito
FrequencyToTranspose(&Samples[iSmp]); // set transpose + finetune for mod files
- // fix transpose + finetune for some rare cases where transpose is not C-5 (e.g. sample 4 in wander2.mod)
+ // fix transpose + finetune for some rare cases where transpose is not C-5 (e.g. sample 4 in wander2.gdm)
if(m_nType == MOD_TYPE_MOD)
{
while(Samples[iSmp].RelativeTone != 0)
Modified: trunk/OpenMPT/soundlib/Snd_fx.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Snd_fx.cpp 2010-06-26 14:04:46 UTC (rev 633)
+++ trunk/OpenMPT/soundlib/Snd_fx.cpp 2010-07-01 21:47:33 UTC (rev 634)
@@ -1293,7 +1293,7 @@
nStartTick = 1;
//ST3 ignores notes with SD0 completely
else if(GetType() == MOD_TYPE_S3M)
- nStartTick = m_nMusicSpeed;
+ nStartTick = UINT_MAX;
}
//IT compatibility 08. Handling of out-of-range delay command.
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2010-06-26 14:04:46 UTC (rev 633)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2010-07-01 21:47:33 UTC (rev 634)
@@ -467,6 +467,8 @@
else return false;
dwMemPos += 4;
m_nChannels = 0;
+ m_nSamples = 0;
+ m_nInstruments = 0;
// go through all chunks now
while(dwMemPos < dwMemLength)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
