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

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

Revision: 2123
          http://sourceforge.net/p/modplug/code/2123
Author:   manxorist
Date:     2013-05-19 14:31:42 +0000 (Sun, 19 May 2013)
Log Message:
-----------
[Ref] Silence a bunch of trivial unreferenced parameter warnings.

Modified Paths:
--------------
    trunk/OpenMPT/soundlib/SampleFormats.cpp
    trunk/OpenMPT/soundlib/Tables.cpp

Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp	2013-05-19 14:14:39 UTC (rev 2122)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp	2013-05-19 14:31:42 UTC (rev 2123)
@@ -25,6 +25,7 @@
 #include "ChunkReader.h"
 
 
+#ifndef NO_MP3_SAMPLES
 // Check for valid MPEG header
 static bool IsMPEG(const void *data)
 //----------------------------------
@@ -32,6 +33,7 @@
 	const uint8 *header = static_cast<const uint8  *>(data);
 	return header[0] == 0xFF && (header[1] & 0xE0) == 0xE0 && (header[1] & 0x18) != 0x08 && (header[1] & 0x06) != 0x00 && (header[2] & 0xF0) != 0xF0;
 }
+#endif // NO_MP3_SAMPLES
 
 
 bool CSoundFile::ReadSampleFromFile(SAMPLEINDEX nSample, const LPBYTE lpMemFile, DWORD dwFileLength)
@@ -2135,6 +2137,9 @@
 		Samples[sample].Convert(MOD_TYPE_IT, GetType());
 		return true;
 	}
+#else
+	UNREFERENCED_PARAMETER(sample);
+	UNREFERENCED_PARAMETER(file);
 #endif // NO_FLAC
 	return false;
 }
@@ -2466,6 +2471,9 @@
 		Samples[sample].Convert(MOD_TYPE_IT, GetType());
 		return true;
 	}
+#else
+	UNREFERENCED_PARAMETER(sample);
+	UNREFERENCED_PARAMETER(file);
 #endif // NO_MP3_SAMPLES
 	return false;
 }

Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp	2013-05-19 14:14:39 UTC (rev 2122)
+++ trunk/OpenMPT/soundlib/Tables.cpp	2013-05-19 14:31:42 UTC (rev 2123)
@@ -141,6 +141,8 @@
 			exts.push_back(otherFormatInfo[i].extension);
 		}
 	}
+#else
+	UNREFERENCED_PARAMETER(otherFormats);
 #endif
 	return exts;
 }

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