modplug-svn-commit Mailing List for modplug (Page 1017)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 535
          http://modplug.svn.sourceforge.net/modplug/?rev=535&view=rev
Author:   saga-games
Date:     2010-03-19 18:43:47 +0000 (Fri, 19 Mar 2010)

Log Message:
-----------
[Fix] Pattern Editor: Display "fine" / "extra fine" portamento effects properly (S3M/IT/MPTM), display SFx macro properly, display MOD effects with no memory properly.
[Ref] Fixed a path in mptrack.h (which apparently doesn't work in VC6, in which OpenMPT doesn't compile properly anyway)

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.cpp
    trunk/OpenMPT/mptrack/Mptrack.h

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================

--- trunk/OpenMPT/mptrack/Moddoc.cpp	2010-03-17 23:18:14 UTC (rev 534)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2010-03-19 18:43:47 UTC (rev 535)
@@ -2327,7 +2327,7 @@
 	case CMD_GLOBALVOLSLIDE:
 	case CMD_CHANNELVOLSLIDE:
 	case CMD_PANNINGSLIDE:
-		if (m_SndFile.m_nType & MOD_TYPE_S3MITMPT)
+		if (m_SndFile.GetType() & MOD_TYPE_S3MITMPT)
 		{
 			if (!param) pos = 29; else
 			if (((param & 0x0F) == 0x0F) && (param & 0xF0))
@@ -2345,7 +2345,7 @@
 		}
 		break;
 	case CMD_PANNING8:
-		if(m_SndFile.m_nType & MOD_TYPE_S3M)
+		if(m_SndFile.GetType() == MOD_TYPE_S3M)
 		{
 			pos = CLAMP(param, 0, 0x80);
 			if(param == 0xA4)
@@ -2373,7 +2373,7 @@
 	case CMD_GLOBALVOLSLIDE:
 	case CMD_CHANNELVOLSLIDE:
 	case CMD_PANNINGSLIDE:
-		if (m_SndFile.m_nType & MOD_TYPE_S3MITMPT)
+		if (m_SndFile.GetType() & MOD_TYPE_S3MITMPT)
 		{
 			if (pos < 15) param = 15-pos; else
 			if (pos < 29) param = (29-pos) | 0xF0; else
@@ -2387,7 +2387,7 @@
 		}
 		break;
 	case CMD_PANNING8:
-		if(m_SndFile.m_nType & MOD_TYPE_S3M)
+		if(m_SndFile.GetType() == MOD_TYPE_S3M)
 			param = (pos <= 0x80) ? pos : 0xA4;
 		break;
 	}
@@ -2398,42 +2398,58 @@
 bool CModDoc::GetEffectNameEx(LPSTR pszName, UINT ndx, UINT param)
 //----------------------------------------------------------------
 {
-	CHAR s[64];
+	char s[64];
+	char szContinueOrIgnore[16];
+
 	if (pszName) pszName[0] = 0;
 	if ((!pszName) || (ndx >= MAX_FXINFO) || (!gFXInfo[ndx].pszName)) return false;
 	wsprintf(pszName, "%s: ", gFXInfo[ndx].pszName);
 	s[0] = 0;
 
+	// for effects that don't have effect memory in MOD format.
+	if(m_SndFile.GetType() == MOD_TYPE_MOD)
+		strcpy(szContinueOrIgnore, "ignore");
+	else
+		strcpy(szContinueOrIgnore, "continue");
+
 	std::string sPlusChar = "+", sMinusChar = "-";
 
 	switch(gFXInfo[ndx].dwEffect)
 	{
 	case CMD_ARPEGGIO:
+		if(m_SndFile.GetType() == MOD_TYPE_XM)	// XM also ignores this!
+			strcpy(szContinueOrIgnore, "ignore");
+
 		if (param)
 			wsprintf(s, "note+%d note+%d", param >> 4, param & 0x0F);
 		else
-			strcpy(s, "continue");
+			strcpy(s, szContinueOrIgnore);
 		break;
 
 	case CMD_PORTAMENTOUP:
-		if (param)
-			wsprintf(s, "+%d", param);
-		else
-			strcpy(s, "continue");
-		break;
-
 	case CMD_PORTAMENTODOWN:
-		if (param)
-			wsprintf(s, "-%d", param);
+		if(param)
+		{
+			char sign[2];
+			strcpy(sign, (gFXInfo[ndx].dwEffect == CMD_PORTAMENTOUP) ? "+" : "-");
+			if((m_SndFile.GetType() & MOD_TYPE_S3MITMPT) && ((param & 0xF0) == 0xF0))
+				wsprintf(s, "fine %s%d", sign, (param & 0x0F));
+			else if((m_SndFile.GetType() & MOD_TYPE_S3MITMPT) && ((param & 0xF0) == 0xE0))
+				wsprintf(s, "extra fine %s%d", sign, (param & 0x0F));
+			else
+				wsprintf(s, "%s%d", sign, param);
+		}
 		else
-			strcpy(s, "continue");
+		{
+			strcpy(s, szContinueOrIgnore);
+		}
 		break;
 
 	case CMD_TONEPORTAMENTO:
 		if (param)
 			wsprintf(s, "speed %d", param);
 		else
-			strcpy(s, "continue");
+			strcpy(s, szContinueOrIgnore);
 		break;
 
 	case CMD_VIBRATO:
@@ -2443,7 +2459,7 @@
 		if (param)
 			wsprintf(s, "speed=%d depth=%d", param >> 4, param & 0x0F);
 		else
-			strcpy(s, "continue");
+			strcpy(s, szContinueOrIgnore);
 		break;
 
 	case CMD_SPEED:
@@ -2500,7 +2516,7 @@
 	case CMD_PANNINGSLIDE:
 		if(gFXInfo[ndx].dwEffect == CMD_PANNINGSLIDE)
 		{
-			if(m_SndFile.m_nType & MOD_TYPE_XM)
+			if(m_SndFile.GetType() == MOD_TYPE_XM)
 			{
 				sPlusChar = "-> ";
 				sMinusChar = "<- ";
@@ -2516,11 +2532,11 @@
 		{
 			wsprintf(s, "continue");
 		} else
-		if ((m_SndFile.m_nType & MOD_TYPE_S3MITMPT) && ((param & 0x0F) == 0x0F) && (param & 0xF0))
+		if ((m_SndFile.GetType() & MOD_TYPE_S3MITMPT) && ((param & 0x0F) == 0x0F) && (param & 0xF0))
 		{
 			wsprintf(s, "fine %s%d", sPlusChar.c_str(), param >> 4);
 		} else
-		if ((m_SndFile.m_nType & MOD_TYPE_S3MITMPT) && ((param & 0xF0) == 0xF0) && (param & 0x0F))
+		if ((m_SndFile.GetType() & MOD_TYPE_S3MITMPT) && ((param & 0xF0) == 0xF0) && (param & 0x0F))
 		{
 			wsprintf(s, "fine %s%d", sMinusChar.c_str(), param & 0x0F);
 		} else
@@ -2706,8 +2722,9 @@
 						strcat(s, " rows");
 						break;
 					case 0xF0: // macro
-						if(m_SndFile.m_nType & MOD_TYPE_MOD)
-						wsprintf(s, "SF%X", param & 0x0F); break;
+						if(m_SndFile.GetType() != MOD_TYPE_MOD)
+							wsprintf(s, "SF%X", param & 0x0F);
+						break;
 					default:
 						break;
 					}
@@ -2754,7 +2771,7 @@
 						strcat(s, " rows");
 						break;
 					case 0xF0:
-						if(m_SndFile.m_nType & MOD_TYPE_MOD) // invert loop
+						if(m_SndFile.GetType() == MOD_TYPE_MOD) // invert loop
 						{
 							if((param & 0x0F) == 0)
 								strcpy(s, "Stop");
@@ -3514,4 +3531,4 @@
 			displayName.Format(TEXT("%s (%s)"), (LPCTSTR)instrumentName, (LPCTSTR)pluginName);
 	}
 	return displayName;
-}
+}
\ No newline at end of file

Modified: trunk/OpenMPT/mptrack/Mptrack.h
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.h	2010-03-17 23:18:14 UTC (rev 534)
+++ trunk/OpenMPT/mptrack/Mptrack.h	2010-03-19 18:43:47 UTC (rev 535)
@@ -13,7 +13,7 @@
 #endif
 
 #include "resource.h"       // main symbols
-#include "sndfile.h"
+#include "../soundlib/Sndfile.h"
 #include <windows.h>
 
 #ifdef UPDATECHECKENABLED


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




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 (49)	Jun (55)	Jul (91)	Aug (191)	Sep	Oct (68)	Nov	Dec

modplug-svn-commit Mailing List for modplug (Page 1017)

A music tracker software for Windows.

modplug-svn-commit — OpenMPT subversion commit notifications