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

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 273
          http://modplug.svn.sourceforge.net/modplug/?rev=273&view=rev
Author:   relabsoluness
Date:     2009-06-23 19:38:41 +0000 (Tue, 23 Jun 2009)

Log Message:
-----------
(Patches from Jojo, merged somewhat modified)
+ General: Can now import GDM files.
/ Pattern tab: Improved echo paste undo.
. Misc: Document will now be set modified when changing rows per beat from main bar.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Mainbar.cpp
    trunk/OpenMPT/mptrack/Modedit.cpp
    trunk/OpenMPT/mptrack/mptrack.vcproj
    trunk/OpenMPT/soundlib/Sndfile.cpp
    trunk/OpenMPT/soundlib/Sndfile.h

Added Paths:
-----------
    trunk/OpenMPT/soundlib/Load_gdm.cpp

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

--- trunk/OpenMPT/mptrack/Mainbar.cpp	2009-06-17 18:44:27 UTC (rev 272)
+++ trunk/OpenMPT/mptrack/Mainbar.cpp	2009-06-23 19:38:41 UTC (rev 273)
@@ -487,6 +487,7 @@
 	if ((nCurrentSpeed < 0) || (nCurrentTempo < 0)) return;
 	if ((pMainFrm = CMainFrame::GetMainFrame()) != NULL)
 	{
+		CModDoc *pModDoc = pMainFrm->GetModPlaying();
 		CSoundFile *pSndFile = pMainFrm->GetSoundFilePlaying();
 		if (pSndFile)
 		{
@@ -524,12 +525,14 @@
 					if (nCurrentRowsPerBeat > 1)
 					{
 						pSndFile->m_nRowsPerBeat = nCurrentRowsPerBeat - 1;
+						pModDoc->SetModified(true);
 					}
 				} else
 				{
 					if (nCurrentRowsPerBeat < 64)
 					{
 						pSndFile->m_nRowsPerBeat = nCurrentRowsPerBeat + 1;
+						pModDoc->SetModified(true);
 					}
 				}
 				m_SpinRowsPerBeat.SetPos(0);

Modified: trunk/OpenMPT/mptrack/Modedit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Modedit.cpp	2009-06-17 18:44:27 UTC (rev 272)
+++ trunk/OpenMPT/mptrack/Modedit.cpp	2009-06-23 19:38:41 UTC (rev 273)
@@ -1833,6 +1833,7 @@
 						nPattern = m_SndFile.Order[oNextOrder];
 						if(m_SndFile.Patterns.IsValidIndex(nPattern) == false) goto PasteDone;
 						m = m_SndFile.Patterns[nPattern];
+						PrepareUndo(nPattern, 0,0, m_SndFile.m_nChannels, m_SndFile.PatternSize[nPattern]);
 						oCurrentOrder = oNextOrder;
 					}
 				}

Modified: trunk/OpenMPT/mptrack/mptrack.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack.vcproj	2009-06-17 18:44:27 UTC (rev 272)
+++ trunk/OpenMPT/mptrack/mptrack.vcproj	2009-06-23 19:38:41 UTC (rev 273)
@@ -277,6 +277,9 @@
 				RelativePath="..\soundlib\Load_far.cpp">
 			</File>
 			<File
+				RelativePath="..\soundlib\Load_gdm.cpp">
+			</File>
+			<File
 				RelativePath="..\soundlib\Load_it.cpp">
 			</File>
 			<File

Added: trunk/OpenMPT/soundlib/Load_gdm.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_gdm.cpp	                        (rev 0)
+++ trunk/OpenMPT/soundlib/Load_gdm.cpp	2009-06-23 19:38:41 UTC (rev 273)
@@ -0,0 +1,532 @@
+/*
+ * This source code is public domain.
+ *
+ * Purpose: Load GDM (BWSB Soundsystem) modules
+ * Authors: Johannes Schultz
+ *
+ * This code is partly based on zilym's original code / specs (which are utterly wrong :P).
+ * Thanks to the MenTaLguY for gdm.txt and ajs for gdm2s3m and some hints.
+ *
+ * Hint 1: Most (all?) of the unsupported features were not supported in 2GDM / BWSB either.
+ * Hint 2: Files will be played like their original formats would be played in MPT, so no
+ *         BWSB quirks including crashes and freezes are supported. :-P
+*/
+
+#include "stdafx.h"
+#include "sndfile.h"
+
+#pragma pack(1)
+
+typedef struct _GDMHEADER
+{
+	DWORD ID;						// ID: 'GDM\xFE'
+	CHAR SongTitle[32];				// Music's title
+	CHAR SongMusician[32];			// Name of music's composer
+	CHAR DOSEOF[3];					// 13, 10, 26
+	DWORD ID2;						// ID: 'GMFS'
+	BYTE FormMajorVer;				// Format major version
+	BYTE FormMinorVer;				// Format minor version
+	UINT16 TrackID;					// Composing Tracker ID code (00 = 2GDM)
+	BYTE TrackMajorVer;				// Tracker's major version
+	BYTE TrackMinorVer;				// Tracker's minor version
+	BYTE PanMap[32];					// 0-Left to 15-Right, 255-N/U
+	BYTE MastVol;						// Range: 0...64
+	BYTE Tempo;						// Initial music tempo (6)
+	BYTE BPM;							// Initial music BPM (125)
+	UINT16 FormOrigin;				// Original format ID:
+		// 1-MOD, 2-MTM, 3-S3M, 4-669, 5-FAR, 6-ULT, 7-STM, 8-MED
+		// (versions of 2GDM prior to v1.15 won't set this correctly)
+
+	UINT32 OrdOffset;
+	BYTE NOO;							// Number of orders in module - 1
+	UINT32 PatOffset;
+	BYTE NOP;							// Number of patterns in module - 1
+	UINT32 SamHeadOffset;
+	UINT32 SamOffset;
+	BYTE NOS;							// Number of samples in module - 1
+	UINT32 MTOffset;					// Offset of song message
+	UINT32 MTLength;
+	UINT32 SSOffset;					// Offset of scrolly script (huh?)
+	UINT16 SSLength;
+	UINT32 TGOffset;					// Offset of text graphic (huh?)
+	UINT16 TGLength;
+} GDMHEADER, *PGDMHEADER;
+
+typedef struct _GDMSAMPLEHEADER
+{
+	CHAR SamName[32];
+	CHAR FileName[12];
+	BYTE EmsHandle;		// useless
+	UINT32 Length;
+	UINT32 LoopBegin;
+	UINT32 LoopEnd;
+	BYTE Flags;
+	UINT16 C4Hertz;
+	BYTE Volume;
+	BYTE Pan;
+} GDMSAMPLEHEADER, *PGDMSAMPLEHEADER;
+
+BOOL CSoundFile::ReadGDM(const LPCBYTE lpStream, const DWORD dwMemLength)
+//-----------------------------------------------------------
+{
+	if ((!lpStream) || (dwMemLength < sizeof(GDMHEADER))) return FALSE;
+
+	const PGDMHEADER pHeader = (PGDMHEADER)lpStream;
+
+	// is it a valid GDM file?
+	if(	(LittleEndian(pHeader->ID) != 0xFE4D4447) || //GDM\xFE
+		(pHeader->DOSEOF[0] != 13 || pHeader->DOSEOF[1] != 10 || pHeader->DOSEOF[2] != 26) || //CR+LF+EOF
+		(LittleEndian(pHeader->ID2) != 0x53464D47)) return FALSE; //GMFS
+
+	// song name
+	memset(m_szNames, 0, sizeof(m_szNames));
+	memcpy(m_szNames[0], pHeader->SongTitle, 32);
+	SetNullTerminator(m_szNames[0]);
+
+	// there are no other format versions...
+	if(pHeader->FormMajorVer != 1 || pHeader->FormMinorVer != 0)
+	{
+		::MessageBox(0, TEXT("GDM file seems to be valid, but this format version is currently not supported."), TEXT("OpenMPT GDM import"), MB_ICONERROR);
+		return FALSE;
+	}
+
+	// todo: Is TrackID, TrackMajorVer, TrackMinorVer relevant? The only TrackID should be 0 - 2GDM.exe
+
+	// read channel pan map... 0...15 = channel panning, 16 = surround channel, 255 = channel does not exist
+	m_nChannels = 32;
+	for(int i = 0; i < 32; i++)
+	{
+		if(pHeader->PanMap[i] < 16)
+		{		
+			ChnSettings[i].nPan = min((pHeader->PanMap[i] << 4) + 8, 256);
+		}
+		else if(pHeader->PanMap[i] == 16)
+		{
+			ChnSettings[i].nPan = 128;
+			ChnSettings[i].dwFlags |= CHN_SURROUND;
+		}
+		else if(pHeader->PanMap[i] == 0xff)
+		{
+			m_nChannels = i;
+			break;
+		}
+	}
+
+	m_nDefaultGlobalVolume = min(pHeader->MastVol << 2, 256);
+	m_nDefaultSpeed = pHeader->Tempo;
+	m_nDefaultTempo = pHeader->BPM;
+	m_nRestartPos = 0; // not supported in this format, so use the default value
+	m_nSamplePreAmp = 48; // dito
+	m_nVSTiVolume = 48; // dito
+
+	// 1-MOD, 2-MTM, 3-S3M, 4-669, 5-FAR, 6-ULT, 7-STM, 8-MED
+
+	switch(pHeader->FormOrigin)
+	{
+	case 1:
+		m_nType = MOD_TYPE_MOD;
+		break;
+	case 2:
+		m_nType = MOD_TYPE_MTM;
+		break;
+	case 3:
+		m_nType = MOD_TYPE_S3M;
+		break;
+	case 4:
+		m_nType = MOD_TYPE_669;
+		break;
+	case 5:
+		m_nType = MOD_TYPE_FAR;
+		break;
+	case 6:
+		m_nType = MOD_TYPE_ULT;
+		break;
+	case 7:
+		m_nType = MOD_TYPE_STM;
+		break;
+	case 8:
+		m_nType = MOD_TYPE_MED;
+		break;
+	default:
+		::MessageBox(0, TEXT("GDM file seems to be valid, but the original format is currently not supported.\nThis should not happen."), TEXT("OpenMPT GDM import"), MB_ICONERROR);
+		return FALSE;
+		break;
+	}
+
+	// check if offsets are valid. we won't read the scrolly text or text graphics, but invalid pointers would probably indicate a broken file...
+	if(	   dwMemLength < pHeader->OrdOffset || dwMemLength - pHeader->OrdOffset < pHeader->NOO
+		|| dwMemLength < pHeader->PatOffset
+		|| dwMemLength < pHeader->SamHeadOffset || dwMemLength - pHeader->SamHeadOffset < (pHeader->NOS + 1) * sizeof(GDMSAMPLEHEADER)
+		|| dwMemLength < pHeader->SamOffset
+		|| dwMemLength < pHeader->MTOffset || dwMemLength - pHeader->MTOffset < pHeader->MTLength
+		|| dwMemLength < pHeader->SSOffset ||  dwMemLength - pHeader->SSOffset < pHeader->SSLength
+		|| dwMemLength < pHeader->TGOffset || dwMemLength - pHeader->TGOffset < pHeader->TGLength)
+		return FALSE;
+
+	// read orders
+	Order.ReadAsByte(lpStream + pHeader->OrdOffset, pHeader->NOO + 1, dwMemLength - pHeader->OrdOffset);
+
+	// read samples
+	m_nSamples = pHeader->NOS + 1;
+	
+	DWORD iSampleOffset = pHeader->SamOffset;
+	int iLZWsamples = 0;
+
+	for(UINT iSmp = 1; iSmp <= m_nSamples; iSmp++)
+	{
+		const PGDMSAMPLEHEADER pSample = (PGDMSAMPLEHEADER)(lpStream + pHeader->SamHeadOffset + (iSmp - 1) * sizeof(GDMSAMPLEHEADER));
+
+		// sample header
+
+		memcpy(m_szNames[iSmp], pSample->SamName, 32);
+		SetNullTerminator(m_szNames[iSmp]);
+		memcpy(Ins[iSmp].name, pSample->FileName, 12);
+
+		Ins[iSmp].nC4Speed = pSample->C4Hertz;
+		Ins[iSmp].nGlobalVol = 256; // not supported in this format
+		Ins[iSmp].nLength = min(pSample->Length, MAX_SAMPLE_LENGTH); // in bytes
+		Ins[iSmp].nLoopStart = min(pSample->LoopBegin, Ins[iSmp].nLength); // in samples
+		Ins[iSmp].nLoopEnd = min(pSample->LoopEnd - 1, Ins[iSmp].nLength); // dito
+		FrequencyToTranspose(&Ins[iSmp]); // set transpose + finetune for mod files
+
+		if(pSample->Flags & 0x01) Ins[iSmp].uFlags |= CHN_LOOP; // loop sample
+
+		if(pSample->Flags & 0x04)
+		{
+			Ins[iSmp].nVolume = min(pSample->Volume << 2, 256); // 0...64, 255 = no default volume
+		}
+		else
+		{
+			Ins[iSmp].nVolume = 256; // default volume
+		}
+
+		if(pSample->Flags & 0x08) // default panning is used
+		{
+			Ins[iSmp].uFlags |= CHN_PANNING;
+			Ins[iSmp].nPan = (pSample->Pan > 15) ? 128 : min((pSample->Pan << 4) + 8, 256); // 0...15, 16 = surround (not supported), 255 = no default panning
+		}
+		else
+		{
+			Ins[iSmp].nPan = 128;
+		}
+
+		/* note: apparently (and according to zilym), 2GDM doesn't handle 16 bit or stereo samples properly.
+		   so those flags are pretty much meaningless and we will ignore them... in fact, samples won't load as expected if we don't! */
+		
+		UINT iSampleFormat;
+		if(pSample->Flags & 0x02) // 16 bit
+		{
+			if(pSample->Flags & 0x20) // stereo
+			{
+				iSampleFormat = RS_PCM16U; // should be RS_STPCM16U but that breaks the sample reader
+			}
+			else
+			{
+				iSampleFormat = RS_PCM16U;
+			}
+		}
+		else // 8 bit
+		{
+			if(pSample->Flags & 0x20) // stereo
+			{
+				iSampleFormat = RS_PCM8U; // should be RS_STPCM8U - dito
+			}
+			else
+			{
+				iSampleFormat = RS_PCM8U;
+			}
+		}
+
+		// according to zilym, LZW support has never been finished, so this is also practically useless.
+		if(pSample->Flags & 0x10)
+			iLZWsamples++;
+
+		// read sample data
+		ReadSample(&Ins[iSmp], iSampleFormat, reinterpret_cast<LPCSTR>(lpStream + iSampleOffset), dwMemLength - iSampleOffset);
+		iSampleOffset += min(pSample->Length, dwMemLength - iSampleOffset);
+
+	}
+
+	// read patterns
+	Patterns.ResizeArray(max(MAX_PATTERNS, pHeader->NOP + 1));
+
+	// position in file
+	DWORD iPatternsOffset = pHeader->PatOffset;
+
+	BOOL bS3MCommandSet = (GetBestSaveFormat() & (MOD_TYPE_S3M | MOD_TYPE_IT | MOD_TYPE_MPT));
+
+	for (PATTERNINDEX iPat = 0; iPat < pHeader->NOP + 1; iPat++)
+	{
+		
+		if(iPatternsOffset + 2 > dwMemLength) break;
+		UINT16 iPatternLength = *(UINT16 *)(lpStream + iPatternsOffset); // pattern length including the two "length" bytes
+		if(iPatternLength > dwMemLength || iPatternsOffset > dwMemLength - iPatternLength) break;
+
+		if(Patterns.Insert(iPat, 64)) 
+		{
+			CString s;
+			s.Format(TEXT("Allocating patterns failed starting from pattern %u"), iPat);
+			MessageBox(NULL, s, TEXT("OpenMPT GDM import"), MB_ICONERROR);
+			break;
+		}
+
+		// position in THIS pattern
+		DWORD iPatternPos = iPatternsOffset + 2;
+
+		MODCOMMAND *p = Patterns[iPat];
+
+		for(UINT iRow = 0; iRow < 64; iRow++)
+		{
+			do // zero byte = next row
+			{
+				if(iPatternPos + 1 > dwMemLength) break;
+
+				BYTE bChannel = lpStream[iPatternPos++];
+
+				if(bChannel == 0) break; // next row, please!
+
+				UINT channel = bChannel & 0x1f;
+				if(channel >= m_nChannels) break; // better safe than sorry!
+
+				MODCOMMAND *m = &p[iRow * m_nChannels + channel];
+
+				if(bChannel & 0x20)
+				{
+					// note and sample follows
+					if(iPatternPos + 2 > dwMemLength) break;
+					BYTE bNote = lpStream[iPatternPos++];
+					BYTE bSample = lpStream[iPatternPos++];
+
+					bNote = (bNote & 0x7F) - 1; // this format doesn't have note cuts
+					if(bNote < 0xF0) bNote = (bNote & 0x0F) + 12 * (bNote >> 4) + 13;
+					if(bNote == 0xFF) bNote = 0;
+					m->note = bNote;
+					m->instr = bSample;
+
+				}
+
+				if(bChannel & 0x40)
+				{
+					// effect(s) follow
+
+					m->command = CMD_NONE;
+					m->volcmd = CMD_NONE;
+
+					do
+					{
+						if(iPatternPos + 2 > dwMemLength) break;
+						BYTE bEffect = lpStream[iPatternPos++];
+						BYTE bEffectData = lpStream[iPatternPos++];
+
+						BYTE command = bEffect & 0x1F, param = bEffectData;
+						BYTE volcommand = CMD_NONE, volparam = param;
+
+						switch(command)
+						{
+						case 0x01: command = CMD_PORTAMENTOUP; if(param >= 0xE0) param = 0xDF; break;
+						case 0x02: command = CMD_PORTAMENTODOWN; if(param >= 0xE0) param = 0xDF; break;
+						case 0x03: command = CMD_TONEPORTAMENTO; break;
+						case 0x04: command = CMD_VIBRATO; break;
+						case 0x05: command = CMD_TONEPORTAVOL; if (param & 0xF0) param &= 0xF0; break;
+						case 0x06: command = CMD_VIBRATOVOL; if (param & 0xF0) param &= 0xF0; break;
+						case 0x07: command = CMD_TREMOLO; break;
+						case 0x08: command = CMD_TREMOR; break;
+						case 0x09: command = CMD_OFFSET; break;
+						case 0x0A: command = CMD_VOLUMESLIDE; break;
+						case 0x0B: command = CMD_POSITIONJUMP; break;
+						case 0x0C: 
+							if(bS3MCommandSet)
+							{
+								command = CMD_NONE;
+								volcommand = VOLCMD_VOLUME;
+								volparam = min(param, 64);
+							}
+							else
+							{
+								command = CMD_VOLUME;
+								param = min(param, 64);
+							}
+							break;
+						case 0x0D: command = CMD_PATTERNBREAK; break;
+						case 0x0E: 
+							if(bS3MCommandSet)
+							{
+								command = CMD_S3MCMDEX;
+								// need to do some remapping
+								switch(param >> 4)
+								{
+								case 0x0:
+									// set filter
+									command = CMD_MODCMDEX;
+									break;
+								case 0x1:
+									// fine porta up
+									command = CMD_PORTAMENTOUP;
+									param = 0xF0 | (param & 0x0F);
+									break;
+								case 0x2:
+									// fine porta down
+									command = CMD_PORTAMENTODOWN;
+									param = 0xF0 | (param & 0x0F);
+									break;
+								case 0x3:
+									// glissando control
+									param = 0x10 | (param & 0x0F);
+									break;
+								case 0x4:
+									// vibrato waveform
+									param = 0x30 | (param & 0x0F);
+									break;
+								case 0x5:
+									// set finetune
+									param = 0x20 | (param & 0x0F);
+									break;
+								case 0x6:
+									// pattern loop
+									param = 0xB0 | (param & 0x0F);
+									break;
+								case 0x7:
+									// tremolo waveform
+									param = 0x40 | (param & 0x0F);
+									break;
+								case 0x8:
+									// extra fine porta up
+									command = CMD_PORTAMENTOUP;
+									param = 0xE0 | (param & 0x0F);
+									break;
+								case 0x9:
+									// extra fine porta down
+									command = CMD_PORTAMENTODOWN;
+									param = 0xE0 | (param & 0x0F);
+									break;
+								case 0xA:
+									// fine volume up
+									command = CMD_VOLUMESLIDE;
+									param = ((param & 0x0F) << 4) | 0x0F;
+									break;
+								case 0xB:
+									// fine volume down
+									command = CMD_VOLUMESLIDE;
+									param = 0xF0 | (param & 0x0F);
+									break;
+								case 0xC:
+									// note cut
+									break;
+								case 0xD:
+									// note delay
+									break;
+								case 0xE:
+									// pattern delay
+									break;
+								case 0xF:
+									command = CMD_MODCMDEX;
+									// invert loop / funk repeat
+									break;
+								}
+							}
+							else
+							{
+								command = CMD_MODCMDEX;
+							}
+							break;
+						case 0x0F: command = CMD_SPEED; break;
+						case 0x10: command = CMD_ARPEGGIO; break;
+						case 0x11: command = CMD_NONE /* set internal flag */; break;
+						case 0x12:
+							if((!bS3MCommandSet) && ((param & 0xF0) == 0))
+							{
+								// retrig in "mod style"
+								command = CMD_MODCMDEX;
+								param = 0x90 | (param & 0x0F);
+							}
+							else
+							{
+								// either "s3m style" is required or this format is like s3m anyway
+								command = CMD_RETRIG;
+							}
+							break;
+						case 0x13: command = CMD_GLOBALVOLUME; break;
+						case 0x14: command = CMD_FINEVIBRATO; break;
+						case 0x1E:
+							switch(param >> 4)
+							{
+							case 0x0:
+								switch(param & 0x0F)
+								{
+								case 0x0: command = CMD_S3MCMDEX; param = 0x90; break;
+								case 0x1: command = CMD_PANNING8; param = 0xA4; break;
+								case 0x2: command = CMD_NONE /* set normal loop - not implemented in 2GDM */; break;
+								case 0x3: command = CMD_NONE /* set bidi loop - dito */; break;
+								case 0x4: command = CMD_S3MCMDEX; param = 0x9E; break;
+								case 0x5: command = CMD_S3MCMDEX; param = 0x9F; break;
+								case 0x6: command = CMD_NONE /* monaural sample - dito */; break;
+								case 0x7: command = CMD_NONE /* stereo sample - dito */; break;
+								case 0x8: command = CMD_NONE /* stop sample on end - dito */; break;
+								case 0x9: command = CMD_NONE /* loop sample on end - dito */; break;
+								default: command = CMD_NONE; break;
+								}
+								break;
+							case 0x8:
+								command = (bS3MCommandSet) ? CMD_S3MCMDEX : CMD_MODCMDEX;
+								break;
+							case 0xD:
+								// adjust frequency (increment in hz) - not implemented in 2GDM
+								command = CMD_NONE;
+								break;
+							default: command = CMD_NONE; break;
+							}
+							break;
+						case 0x1F: command = CMD_TEMPO; break;
+						default: command = CMD_NONE; break;
+						}
+
+						if(command != CMD_NONE)
+						{
+							// move pannings to volume column - should never happen
+							if(m->command == CMD_S3MCMDEX && ((m->param >> 4) == 0x8) && volcommand == CMD_NONE)
+							{
+								volcommand = VOLCMD_PANNING;
+								volparam = ((param & 0x0F) << 2) + 2;
+							}
+
+							m->command = command;
+							m->param = param;
+						}
+						if(volcommand != CMD_NONE)
+						{
+							m->volcmd = volcommand;
+							m->vol = volparam;
+						}
+
+						if(!(bEffect & 0x20)) break; // no other effect follows
+					} while(1);
+
+				}
+				
+			} while(1);
+		}
+
+		iPatternsOffset += iPatternLength;
+	}
+
+	// read song comments	
+	if(pHeader->MTLength)
+	{
+		m_lpszSongComments = new char[pHeader->MTLength + 1];
+		if (m_lpszSongComments)
+		{
+			memset(m_lpszSongComments, 0, pHeader->MTLength + 1);
+			memcpy(m_lpszSongComments, lpStream + pHeader->MTOffset, pHeader->MTLength);
+		}
+	}
+
+	if(iLZWsamples)
+	{
+		TCHAR s[128];
+		wsprintf(s, TEXT("%d samples are LZW compressed. LZW compression is currently not supported.\nPlease send this file to the OpenMPT team."), iLZWsamples);
+		::MessageBox(0, s, TEXT("OpenMPT GDM import"), MB_ICONWARNING);
+	}
+	
+	return TRUE;
+
+}

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2009-06-17 18:44:27 UTC (rev 272)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2009-06-23 19:38:41 UTC (rev 273)
@@ -593,6 +593,7 @@
 #endif
 #endif // MODPLUG_BASIC_SUPPORT
 		 && (!ReadMO3(lpStream, dwMemLength))
+		 && (!ReadGDM(lpStream, dwMemLength))
 		 && (!ReadMod(lpStream, dwMemLength))) m_nType = MOD_TYPE_NONE;
 #ifdef ZIPPED_MOD_SUPPORT
 		if ((!m_lpszSongComments) && (archive.GetComments(FALSE)))

Modified: trunk/OpenMPT/soundlib/Sndfile.h
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.h	2009-06-17 18:44:27 UTC (rev 272)
+++ trunk/OpenMPT/soundlib/Sndfile.h	2009-06-23 19:38:41 UTC (rev 273)
@@ -1068,6 +1068,7 @@
 	BOOL ReadJ2B(LPCBYTE lpStream, DWORD dwMemLength);
 	BOOL ReadUMX(LPCBYTE lpStream, DWORD dwMemLength);
 	BOOL ReadMO3(LPCBYTE lpStream, const DWORD dwMemLength);
+	BOOL ReadGDM(const LPCBYTE lpStream, const DWORD dwMemLength);
 	BOOL ReadMID(LPCBYTE lpStream, DWORD dwMemLength);
 	// Save Functions
 #ifndef MODPLUG_NO_FILESAVE


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 (191)	Aug	Sep	Oct	Nov	Dec

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

A music tracker software for Windows.

modplug-svn-commit — OpenMPT subversion commit notifications