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

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

Revision: 1885
          http://sourceforge.net/p/modplug/code/1885
Author:   manxorist
Date:     2013-04-16 14:16:26 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
[Ref] Document NO_ARCHIVE_SUPPORT in stdafx.h.
[Ref] Remove pointless NO_COPYRIGHT and MODPLUG_BASIC_SUPPORT.

Modified Paths:
--------------
    trunk/OpenMPT/common/stdafx.h
    trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/common/stdafx.h
===================================================================
--- trunk/OpenMPT/common/stdafx.h	2013-04-15 21:00:35 UTC (rev 1884)
+++ trunk/OpenMPT/common/stdafx.h	2013-04-16 14:16:26 UTC (rev 1885)
@@ -73,6 +73,9 @@
 
 #endif // ENABLE_ASM
 
+// Disable unarchiving support
+//#define NO_ARCHIVE_SUPPORT
+
 // Disable the built-in reverb effect
 //#define NO_REVERB
 

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2013-04-15 21:00:35 UTC (rev 1884)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2013-04-16 14:16:26 UTC (rev 1885)
@@ -21,7 +21,6 @@
 #include "../common/StringFixer.h"
 #include "FileReader.h"
 
-#ifndef NO_COPYRIGHT
 #ifndef NO_MMCMP_SUPPORT
 #define MMCMP_SUPPORT
 #endif // NO_MMCMP_SUPPORT
@@ -31,9 +30,6 @@
 #define UNGZIP_SUPPORT
 #define ZIPPED_MOD_SUPPORT
 #endif // NO_ARCHIVE_SUPPORT
-#else // NO_COPYRIGHT: EarSaver only loads mod/s3m/xm/it/wav
-#define MODPLUG_BASIC_SUPPORT
-#endif
 
 #ifdef ZIPPED_MOD_SUPPORT
 #include "../unzip/unzip.h"
@@ -609,7 +605,6 @@
 		 /*&& !ReadMPT(lpStream, dwMemLength)*/
 		 && !ReadS3M(file)
 		 && !ReadWav(file)
-#ifndef MODPLUG_BASIC_SUPPORT
 		 && !ReadSTM(file)
 		 && !ReadMed(lpStream, dwMemLength)
 		 && !ReadMTM(file)
@@ -633,7 +628,6 @@
 #ifdef MODPLUG_TRACKER
 		 && !ReadMID(lpStream, dwMemLength)
 #endif // MODPLUG_TRACKER
-#endif // MODPLUG_BASIC_SUPPORT
 		 && !ReadGDM(file)
 		 && !ReadIMF(file)
 		 && !ReadAM(file)

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