From 46a7dc3c39cb05a33a8ff7a2eb73295811b3455f Mon Sep 17 00:00:00 2001
From: oparviai <oparviai@f3a24b6a-cf45-0410-b55a-8c22e2698227>
Date: Fri, 28 Dec 2012 14:53:56 +0000
Subject: [PATCH] Added files for Android example compilation

---
 README.html       | 18 +++++++++++++-----
 include/STTypes.h | 12 ++++++++++--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/README.html b/README.html
index fc4c0aa..91ddc27 100644
--- a/README.html
+++ b/README.html
@@ -141,11 +141,15 @@ directly and remove the following definition:<blockquote>
     <blockquote>
   <pre>g++ -shared -static -DDLL_EXPORTS -I../../include -o SoundTouch.dll \
      SoundTouchDLL.cpp ../SoundTouch/.libs/libSoundTouch.a
-strip SoundTouch.dll</pre>
+sstrip SoundTouch.dll</pre>
 </blockquote>
 
+<h3>2.1. Building in Android</h3>
+<p>Android compilation instructions are provided in a separate file included in the 
+    source code package, see &quot;<b>source/Android-lib/README-SoundTouch-Android.html</b>&quot;.</p>
+
 <hr>
-<h2>3. About implementation &amp; Usage tips</h2>
+<h2>3. About implementation &amp; Usage tips/h2>
 <h3>3.1. Supported sample data formats</h3>
 <p>The sample data format can be chosen between 16bit signed integer
 and 32bit floating point values, the default is 32bit floating point. </p>
@@ -508,10 +512,14 @@ and estimates the BPM rate:</p>
 </blockquote>
 <hr>
 <h2>5. Change History</h2>
-<h3>5.1. SoundTouch library Change History </h3>
+<h3>55.1. SoundTouch library Change History </h3>
+<p><b>1.7.0+development:</b></p>
+<ul>
+    <li>Added example files for Android compilation </li>
+</ul>
 <p><b>1.7.0:</b></p>
 <ul>
-    <li>Sound quality improvements</li>
+    <li>Sound quality improvements/li>
     <li>Improved flush() to adjust output sound stream duration to match better with 
         ideal duration</li>
     <li>Rewrote x86 cpu feature check to resolve compatibility problems</li>
@@ -764,6 +772,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA</p>
 <hr><!--
 $Id$
-->
     <p>
-        <i>README.html file updated on 8-Nov-2012</i></p>
+        <i>RREADME.html file updated on 28-Dec-2012</i></p>
 </body>
 </html>
diff --git a/include/STTypes.h b/include/STTypes.h
index c031952..92016fb 100644
--- a/include/STTypes.h
+++ b/include/STTypes.h
@@ -54,8 +54,9 @@ typedef unsigned long   ulong;
 #define SOUNDTOUCH_ALIGN_POINTER_16(x)      ( ( (ulongptr)(x) + 15 ) & ~(ulongptr)15 )
 
 
-#ifdef __GNUC__
-    // In GCC, include soundtouch_config.h made by config scritps
+#if (defined(__GNUC__) && !defined(ANDROID))
+    // In GCC, include soundtouch_config.h made by config scritps.
+    // Skip this in Android compilation that uses GCC but without configure scripts.
     #include "soundtouch_config.h"
 #endif
 
@@ -77,6 +78,13 @@ namespace soundtouch
     //#undef SOUNDTOUCH_INTEGER_SAMPLES
     //#undef SOUNDTOUCH_FLOAT_SAMPLES
 
+    #if (defined(__SOFTFP__))
+        // For Android compilation: Force use of Integer samples in case that
+        // compilation uses soft-floating point emulation - soft-fp is way too slow
+        #undef  SOUNDTOUCH_FLOAT_SAMPLES
+        #define SOUNDTOUCH_INTEGER_SAMPLES      1
+    #endif
+
     #if !(SOUNDTOUCH_INTEGER_SAMPLES || SOUNDTOUCH_FLOAT_SAMPLES)
        
         /// Choose either 32bit floating point or 16bit integer sampletype