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

[<sag...@us...>]

Revision: 715
          http://modplug.svn.sourceforge.net/modplug/?rev=715&view=rev
Author:   saga-games
Date:     2010-09-23 19:24:56 +0000 (Thu, 23 Sep 2010)

Log Message:
-----------
[Mod] ITP Saver/Loader: Song flags that only concern playback are not dumped into ITP files anymore (f.e. SONG_FIRSTTICK, SONG_STEP, etc.).
[Mod] OpenMPT: Version is now 1.19.00.04

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/version.h
    trunk/OpenMPT/soundlib/Load_itp.cpp
    trunk/OpenMPT/soundlib/Snd_defs.h

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2010-09-23 19:22:15 UTC (rev 714)
+++ trunk/OpenMPT/mptrack/version.h	2010-09-23 19:24:56 UTC (rev 715)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					19
 #define VER_MINOR					00
-#define VER_MINORMINOR				03
+#define VER_MINORMINOR				04
 
 //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_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp	2010-09-23 19:22:15 UTC (rev 714)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp	2010-09-23 19:24:56 UTC (rev 715)
@@ -82,7 +82,7 @@
 
 	// m_dwSongFlags
 	memcpy(&id,lpStream+dwMemPos,sizeof(DWORD));
-	m_dwSongFlags = id;
+	m_dwSongFlags = (id & SONG_FILE_FLAGS);
 	dwMemPos += sizeof(DWORD);
 
 	if(!(m_dwSongFlags & SONG_ITPROJECT)) return false;
@@ -505,7 +505,7 @@
 
 	// Song global config
 
-	id = m_dwSongFlags;
+	id = (m_dwSongFlags & SONG_FILE_FLAGS);
 	fwrite(&id, 1, sizeof(id), f);
 	id = m_nDefaultGlobalVolume;
 	fwrite(&id, 1, sizeof(id), f);

Modified: trunk/OpenMPT/soundlib/Snd_defs.h
===================================================================
--- trunk/OpenMPT/soundlib/Snd_defs.h	2010-09-23 19:22:15 UTC (rev 714)
+++ trunk/OpenMPT/soundlib/Snd_defs.h	2010-09-23 19:24:56 UTC (rev 715)
@@ -316,6 +316,9 @@
 #define SONG_POSJUMP		0x100000	// Position jump encountered (internal flag, do not touch)
 #define SONG_PT1XMODE		0x200000	// ProTracker 1.x playback mode
 
+#define SONG_FILE_FLAGS	(SONG_EMBEDMIDICFG|SONG_FASTVOLSLIDES|SONG_ITOLDEFFECTS|SONG_ITCOMPATGXX|SONG_LINEARSLIDES|SONG_EXFILTERRANGE|SONG_AMIGALIMITS|SONG_ITPROJECT|SONG_ITPEMBEDIH|SONG_PT1XMODE)
+#define SONG_PLAY_FLAGS (~SONG_FILE_FLAGS)
+
 // Global Options (Renderer)
 #define SNDMIX_REVERSESTEREO	0x0001	// swap L/R audio channels
 #define SNDMIX_NOISEREDUCTION	0x0002	// reduce hiss (do not use, it's just a simple low-pass filter)


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