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

[<man...@us...>]

Revision: 1936
          http://sourceforge.net/p/modplug/code/1936
Author:   manxorist
Date:     2013-04-22 20:36:01 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
[Ref] Both NO_MO3 and NO_MO3_SUPPORT are used, rename all NO_MO3_SUPPORT to NO_MO3.

Modified Paths:
--------------
    trunk/OpenMPT/common/BuildSettings.h
    trunk/OpenMPT/mptrack/Mptrack.cpp
    trunk/OpenMPT/soundlib/Load_mo3.cpp

Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h	2013-04-22 20:32:38 UTC (rev 1935)
+++ trunk/OpenMPT/common/BuildSettings.h	2013-04-22 20:36:01 UTC (rev 1936)
@@ -60,7 +60,7 @@
 //#define NO_PORTAUDIO
 
 // Define to build without MO3 support.
-//#define NO_MO3_SUPPORT
+//#define NO_MO3
 
 // Define to build without DirectSound support.
 //#define NO_DSOUND

Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp	2013-04-22 20:32:38 UTC (rev 1935)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp	2013-04-22 20:36:01 UTC (rev 1936)
@@ -1155,11 +1155,11 @@
 		"All Modules|" + exts +
 		"|"
 		"Compressed Modules (*.mdz;*.s3z;*.xmz;*.itz"
-#ifndef NO_MO3_SUPPORT
+#ifndef NO_MO3
 		";*.mo3"
 #endif
 		")|*.mdz;*.s3z;*.xmz;*.itz;*.mdr;*.zip;*.rar;*.lha;*.gz"
-#ifndef NO_MO3_SUPPORT
+#ifndef NO_MO3
 		";*.mo3"
 #endif
 		"|"

Modified: trunk/OpenMPT/soundlib/Load_mo3.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_mo3.cpp	2013-04-22 20:32:38 UTC (rev 1935)
+++ trunk/OpenMPT/soundlib/Load_mo3.cpp	2013-04-22 20:36:01 UTC (rev 1936)
@@ -29,7 +29,7 @@
 		return false;
 	}
 
-#ifdef NO_MO3_SUPPORT
+#ifdef NO_MO3
 	// As of April 2012, the format revision is 5; Versions > 31 are unlikely to exist in the next few years,
 	// so we will just ignore those if there's no UNMO3 library to tell us if the file is valid or not
 	// (avoid log entry with .MOD files that have a song name starting with "MO3".
@@ -93,5 +93,5 @@
 		FreeLibrary(unmo3);
 	}
 	return result;
-#endif // NO_MO3_SUPPORT
+#endif // NO_MO3
 }

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