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

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

Revision: 4917
          http://sourceforge.net/p/modplug/code/4917
Author:   saga-games
Date:     2015-04-07 19:41:33 +0000 (Tue, 07 Apr 2015)
Log Message:
-----------
[Fix] Samples in tree view were sometimes detuned since linear slides were not set for the preview module (http://bugs.openmpt.org/view.php?id=14).
[Mod] Allow loading PAT files with 0 layers (fixes DOO.PAT)
[Mod] Also display instrument number in pattern status bar if instrument name is empty (http://bugs.openmpt.org/view.php?id=671)
[Mod] OpenMPT: Version is now 1.24.02.09

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/mptrack/Draw_pat.cpp
    trunk/OpenMPT/mptrack/MainFrm.cpp
    trunk/OpenMPT/soundlib/SampleFormats.cpp

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2015-04-04 12:51:19 UTC (rev 4916)
+++ trunk/OpenMPT/common/versionNumber.h	2015-04-07 19:41:33 UTC (rev 4917)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               24
 #define VER_MINOR               02
-#define VER_MINORMINOR          08
+#define VER_MINORMINOR          09
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/mptrack/Draw_pat.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Draw_pat.cpp	2015-04-04 12:51:19 UTC (rev 4916)
+++ trunk/OpenMPT/mptrack/Draw_pat.cpp	2015-04-07 19:41:33 UTC (rev 4917)
@@ -1584,7 +1584,7 @@
 
 						}
 						mpt::String::SetNullTerminator(sztmp);
-						if (sztmp[0]) s.Format("%d: %s", m->instr, sztmp);
+						s.Format("%d: %s", m->instr, sztmp);
 					}
 					break;
 

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	2015-04-04 12:51:19 UTC (rev 4916)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	2015-04-07 19:41:33 UTC (rev 4917)
@@ -1603,6 +1603,7 @@
 	m_WaveFile.Order.resize(1);
 	m_WaveFile.Order[0] = 0;
 	m_WaveFile.Patterns.Insert(0, 80);
+	m_WaveFile.m_SongFlags = SONG_LINEARSLIDES;
 }
 
 

Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp	2015-04-04 12:51:19 UTC (rev 4916)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp	2015-04-07 19:41:33 UTC (rev 4917)
@@ -55,7 +55,7 @@
 	uint8 header[3];
 	if(!file.CanRead(3))
 		return false;
-	file.ReadArrayLE(header);
+	file.ReadArray(header);
 	file.SkipBack(3);
 	return IsMPEG(header);
 }
@@ -749,7 +749,7 @@
 		|| memcmp(fileHeader.id, "ID#000002\0", 10)
 		|| !fileHeader.numInstr || !fileHeader.numSamples
 		|| !file.ReadConvertEndianness(instrHeader)
-		|| !instrHeader.layers
+		//|| !instrHeader.layers	// DOO.PAT has 0 layers
 		|| !file.ReadConvertEndianness(layerHeader)
 		|| !layerHeader.samples)
 	{

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