[OMPT-svn-commit] SF.net SVN: modplug:[233] trunk/OpenMPT

[<rel...@us...>]

Revision: 233
          http://modplug.svn.sourceforge.net/modplug/?rev=233&view=rev
Author:   relabsoluness
Date:     2008-10-24 18:33:16 +0000 (Fri, 24 Oct 2008)

Log Message:
-----------
. When loading S3M files which contain Zxx-effects, user is now asked how to process them. (bug 2166)

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

Modified: trunk/OpenMPT/mptrack/Moddoc.h
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.h	2008-10-18 21:21:29 UTC (rev 232)
+++ trunk/OpenMPT/mptrack/Moddoc.h	2008-10-24 18:33:16 UTC (rev 233)
@@ -143,6 +143,7 @@
 	CSoundFile *GetSoundFile() { return &m_SndFile; }
 	void SetPause(BOOL bPause) { m_bPaused = bPause; }
 	void SetModified(BOOL bModified=TRUE) { SetModifiedFlag(bModified); }
+	void SetShowSaveDialog(bool b) {m_ShowSavedialog = b;}
 	void PostMessageToAllViews(UINT uMsg, WPARAM wParam=0, LPARAM lParam=0);
 	void SendMessageToActiveViews(UINT uMsg, WPARAM wParam=0, LPARAM lParam=0);
 	UINT GetModType() const { return m_SndFile.m_nType; }

Modified: trunk/OpenMPT/soundlib/Load_s3m.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_s3m.cpp	2008-10-18 21:21:29 UTC (rev 232)
+++ trunk/OpenMPT/soundlib/Load_s3m.cpp	2008-10-24 18:33:16 UTC (rev 233)
@@ -10,11 +10,49 @@
 
 #include "stdafx.h"
 #include "sndfile.h"
+#include "../mptrack/moddoc.h"
 
 #pragma warning(disable:4244) //"conversion from 'type1' to 'type2', possible loss of data"
 
 extern WORD S3MFineTuneTable[16];
 
+static void HandleZxx(uint8& nType, MODCOMMAND* const m)
+//-------------------------------------------------------------------
+{
+	if(nType == 0)
+	{
+		CString str;
+		str.Format(GetStrI18N("The S3M file contains Zxx effect. "
+			"It can be processed in the following ways:\n"
+			"Yes   : Convert Zxx to S8x(set panning)-effects (PixPlay)\n"
+			"No    : Remove Zxx effects\n"
+			"Cancel: Keep Zxx effects\n"
+			"\nNote that options (yes) and (no) modify the loaded pattern data."
+			));
+		const int nResult = ::AfxMessageBox(str, MB_YESNOCANCEL|MB_ICONINFORMATION);
+
+		if(nResult == IDYES)
+			nType = 2;
+		else if(nResult == IDNO)
+			nType = 3;
+		else
+			nType = 1;
+	}
+	if(nType != 1)
+	{
+		if(nType == 2)
+		{
+			m->command = CMD_S3MCMDEX;
+			m->param = 0x80 + (m->param & 0xF);
+		}
+		else
+		{
+			m->command = 0;
+			m->param = 0;
+		}
+	}
+}
+
 //////////////////////////////////////////////////////
 // ScreamTracker S3M file support
 
@@ -335,6 +373,7 @@
 		}
 	}
 	// Reading patterns
+	uint8 nZxxHandling = 0;
 	for (UINT iPat=0; iPat<patnum; iPat++)
 	{
 		UINT nInd = ((DWORD)ptr[nins+iPat]) << 4;
@@ -387,6 +426,10 @@
 						m->command = src[j++];
 						m->param = src[j++];
 						if (m->command) S3MConvert(m, FALSE);
+						if(m->command == CMD_MIDI)
+						{
+							HandleZxx(nZxxHandling, m);
+						}
 					}
 				} else
 				{
@@ -411,6 +454,12 @@
 	m_nMinPeriod = 64;
 	m_nMaxPeriod = 32767;
 	if (psfh.flags & 0x10) m_dwSongFlags |= SONG_AMIGALIMITS;
+
+	if(nZxxHandling != 0 && nZxxHandling != 1 && GetpModDoc() != 0)
+	{
+		GetpModDoc()->SetModified();
+		GetpModDoc()->SetShowSaveDialog(true);
+	}
 	return TRUE;
 }
 


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