Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[907] trunk/OpenMPT/mptrack
|
From: <sag...@us...> - 2011-06-26 12:09:45
|
Revision: 907
http://modplug.svn.sourceforge.net/modplug/?rev=907&view=rev
Author: saga-games
Date: 2011-06-26 12:09:38 +0000 (Sun, 26 Jun 2011)
Log Message:
-----------
[Ref] Renamed sfx_fixed_* to zxx_*, macro test should now work again
Modified Paths:
--------------
trunk/OpenMPT/mptrack/Moddoc.cpp
trunk/OpenMPT/mptrack/Moddoc.h
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/mptrack/test/test.cpp
Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp 2011-06-26 09:24:12 UTC (rev 906)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp 2011-06-26 12:09:38 UTC (rev 907)
@@ -3254,7 +3254,7 @@
{
return -1;
}
- for (int macro = 0; macro < NUM_MACROS; macro++)
+ for (size_t macro = 0; macro < NUM_MACROS; macro++)
{
CString macroString = pSndFile->m_MidiCfg.szMidiSFXExt[macro];
if (GetMacroType(macroString) == sfx_plug && MacroToPlugParam(macroString) == param)
@@ -3272,14 +3272,14 @@
//----------------------------------------------------------------------------------
{
// Compare with all possible preset patterns
- for(int i = 1; i < sfx_fixed_max; i++)
+ for(size_t i = 1; i < zxx_max; i++)
{
// Prepare pattern to compare
CHAR szPatterns[128][MACRO_LENGTH];
CreateZxxFromType(szPatterns, static_cast<enmFixedMacroType>(i));
bool bFound = true;
- for(int j = 0; j < 128; j++)
+ for(size_t j = 0; j < 128; j++)
{
if(strncmp(szPatterns[j], szMidiZXXExt[j], MACRO_LENGTH))
{
@@ -3289,7 +3289,7 @@
}
if(bFound) return static_cast<enmFixedMacroType>(i);
}
- return sfx_fixed_custom; // Custom setup
+ return zxx_custom; // Custom setup
}
@@ -3297,32 +3297,32 @@
void CModDoc::CreateZxxFromType(CHAR (&szMidiZXXExt)[128][MACRO_LENGTH], enmFixedMacroType iZxxType)
//--------------------------------------------------------------------------------------------------
{
- for(int i = 0; i < 128; i++)
+ for(size_t i = 0; i < 128; i++)
{
switch(iZxxType)
{
- case sfx_fixed_reso4Bit:
+ case zxx_reso4Bit:
// Type 1 - Z80 - Z8F controls resonance
if (i < 16) wsprintf(szMidiZXXExt[i], "F0F001%02X", i * 8);
else strcpy(szMidiZXXExt[i], "");
break;
- case sfx_fixed_reso7Bit:
+ case zxx_reso7Bit:
// Type 2 - Z80 - ZFF controls resonance
wsprintf(szMidiZXXExt[i], "F0F001%02X", i);
break;
- case sfx_fixed_cutoff:
+ case zxx_cutoff:
// Type 3 - Z80 - ZFF controls cutoff
wsprintf(szMidiZXXExt[i], "F0F000%02X", i);
break;
- case sfx_fixed_mode:
+ case zxx_mode:
// Type 4 - Z80 - ZFF controls filter mode
wsprintf(szMidiZXXExt[i], "F0F002%02X", i);
break;
- case sfx_fixed_resomode:
+ case zxx_resomode:
// Type 5 - Z80 - Z9F controls resonance + filter mode
if (i < 16) wsprintf(szMidiZXXExt[i], "F0F001%02X", i * 8);
else if (i < 32) wsprintf(szMidiZXXExt[i], "F0F002%02X", (i - 16) * 8);
@@ -3352,7 +3352,7 @@
return false;
}
// Z80-Z8F controls resonance
- if(GetZxxType(pSndFile->m_MidiCfg.szMidiZXXExt) != sfx_fixed_reso4Bit)
+ if(GetZxxType(pSndFile->m_MidiCfg.szMidiZXXExt) != zxx_reso4Bit)
{
return false;
}
@@ -3719,7 +3719,8 @@
CString macroText = GetSoundFile()->m_MidiCfg.szMidiSFXExt[checkMacro];
int macroType = GetMacroType(macroText);
- if (macroType==sfx_plug && MacroToPlugParam(macroText)==paramToUse) {
+ if (macroType==sfx_plug && MacroToPlugParam(macroText)==paramToUse)
+ {
CString message;
message.Format("Param %d can already be controlled with macro %X", paramToUse, checkMacro);
CMainFrame::GetMainFrame()->MessageBox(message, "Macro exists for this param",MB_ICONINFORMATION | MB_OK);
@@ -3729,11 +3730,14 @@
//set new macro
CHAR *pMacroToSet = GetSoundFile()->m_MidiCfg.szMidiSFXExt[macroToSet];
- if (paramToUse<128) {
+ if (paramToUse < 128)
+ {
wsprintf(pMacroToSet, "F0F0%Xz",paramToUse+128);
- } else if (paramToUse<384) {
+ } else if (paramToUse < 384)
+ {
wsprintf(pMacroToSet, "F0F1%Xz",paramToUse-128);
- } else {
+ } else
+ {
CString message;
message.Format("Param %d beyond controllable range.", paramToUse);
::MessageBox(NULL,message, "Macro not assigned for this param",MB_ICONINFORMATION | MB_OK);
Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h 2011-06-26 09:24:12 UTC (rev 906)
+++ trunk/OpenMPT/mptrack/Moddoc.h 2011-06-26 12:09:38 UTC (rev 907)
@@ -108,14 +108,14 @@
// fixed macro presets:
enum enmFixedMacroType
{
- sfx_fixed_custom = 0,
- sfx_fixed_reso4Bit, // Type 1 - Z80 - Z8F controls resonance
- sfx_fixed_reso7Bit, // Type 2 - Z80 - ZFF controls resonance
- sfx_fixed_cutoff, // Type 3 - Z80 - ZFF controls cutoff
- sfx_fixed_mode, // Type 4 - Z80 - ZFF controls filter mode
- sfx_fixed_resomode, // Type 5 - Z80 - Z9F controls resonance + filter mode
+ zxx_custom = 0,
+ zxx_reso4Bit, // Type 1 - Z80 - Z8F controls resonance
+ zxx_reso7Bit, // Type 2 - Z80 - ZFF controls resonance
+ zxx_cutoff, // Type 3 - Z80 - ZFF controls cutoff
+ zxx_mode, // Type 4 - Z80 - ZFF controls filter mode
+ zxx_resomode, // Type 5 - Z80 - Z9F controls resonance + filter mode
- sfx_fixed_max
+ zxx_max
};
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2011-06-26 09:24:12 UTC (rev 906)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2011-06-26 12:09:38 UTC (rev 907)
@@ -615,7 +615,7 @@
strcpy(m_MidiCfg.szMidiGlb[MIDIOUT_NOTEOFF], "9c n 0");
strcpy(m_MidiCfg.szMidiGlb[MIDIOUT_PROGRAM], "Cc p");
strcpy(m_MidiCfg.szMidiSFXExt[0], "F0F000z");
- CModDoc::CreateZxxFromType(m_MidiCfg.szMidiZXXExt, sfx_fixed_reso4Bit);
+ CModDoc::CreateZxxFromType(m_MidiCfg.szMidiZXXExt, zxx_reso4Bit);
}
/////////////////////////////////////////////////////////////////////////////
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-06-26 09:24:12 UTC (rev 906)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2011-06-26 12:09:38 UTC (rev 907)
@@ -952,7 +952,7 @@
{
enmFixedMacroType zxx_preset = static_cast<enmFixedMacroType>(m_CbnZxxPreset.GetCurSel());
- if (zxx_preset != sfx_fixed_custom && m_pModDoc != nullptr)
+ if (zxx_preset != zxx_custom && m_pModDoc != nullptr)
{
m_pModDoc->CreateZxxFromType(m_MidiCfg.szMidiZXXExt, zxx_preset);
UpdateDialog();
Modified: trunk/OpenMPT/mptrack/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp 2011-06-26 09:24:12 UTC (rev 906)
+++ trunk/OpenMPT/mptrack/test/test.cpp 2011-06-26 12:09:38 UTC (rev 907)
@@ -240,7 +240,7 @@
// Macros
VERIFY_EQUAL_NONCONT(pModDoc->GetMacroType(pSndFile->m_MidiCfg.szMidiSFXExt[0]), sfx_reso);
VERIFY_EQUAL_NONCONT(pModDoc->GetMacroType(pSndFile->m_MidiCfg.szMidiSFXExt[1]), sfx_drywet);
- //VERIFY_EQUAL_NONCONT(pModDoc->GetZxxType(pSndFile->m_MidiCfg.szMidiZXXExt), zxx_resomode);
+ VERIFY_EQUAL_NONCONT(pModDoc->GetZxxType(pSndFile->m_MidiCfg.szMidiZXXExt), zxx_resomode);
// Channels
VERIFY_EQUAL_NONCONT(pSndFile->GetNumChannels(), 2);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
