=== modified file 'mixxx/src/analyserqueue.cpp'
--- mixxx/src/analyserqueue.cpp	2013-02-28 20:30:15 +0000
+++ mixxx/src/analyserqueue.cpp	2013-04-21 19:13:18 +0000
@@ -161,7 +161,7 @@
 
     do {
         ScopedTimer t("AnalyserQueue::doAnalysis block");
-        read = pSoundSource->read(ANALYSISBLOCKSIZE, data16);
+        read = pSoundSource->read(ANALYSISBLOCKSIZE, samples);
 
         // To compare apples to apples, let's only look at blocks that are the
         // full block size.

=== modified file 'mixxx/src/cachingreader.cpp'
--- mixxx/src/cachingreader.cpp	2013-03-31 17:15:07 +0000
+++ mixxx/src/cachingreader.cpp	2013-04-21 19:22:05 +0000
@@ -261,10 +261,12 @@
         update->status = CHUNK_READ_EOF;
         return;
     }
-
+    
+    CSAMPLE* buffer = request->chunk->data;
+    
     m_pCurrentSoundSource->seek(sample_position);
     int samples_read = m_pCurrentSoundSource->read(samples_to_read,
-                                                   m_pSample);
+                                                   buffer);
 
     // If we've run out of music, the SoundSource can return 0 samples.
     // Remember that SoundSourc->getLength() (which is m_iTrackNumSamples) can
@@ -276,9 +278,8 @@
 
     // TODO(XXX) This loop can't be done with a memcpy, but could be done with
     // SSE.
-    CSAMPLE* buffer = request->chunk->data;
     //qDebug() << "Reading into " << buffer;
-    SampleUtil::convert(buffer, m_pSample, samples_read);
+   // SampleUtil::convert(buffer, m_pSample, samples_read);
     update->status = CHUNK_READ_SUCCESS;
     update->chunk->length = samples_read;
 }

=== modified file 'mixxx/src/dlgprefbpm.cpp' (properties changed: +x to -x)
=== modified file 'mixxx/src/dlgpreferences.cpp' (properties changed: +x to -x)
=== modified file 'mixxx/src/soundsource.h'
--- mixxx/src/soundsource.h	2012-01-07 05:51:04 +0000
+++ mixxx/src/soundsource.h	2013-04-21 19:08:45 +0000
@@ -58,7 +58,7 @@
     virtual ~SoundSource();
     virtual int open() = 0;
     virtual long seek(long) = 0;
-    virtual unsigned read(unsigned long size, const SAMPLE*) = 0;
+    virtual unsigned read(unsigned long size, const CSAMPLE*) = 0;
     virtual long unsigned length() = 0;
     static float str2bpm( QString sBpm );
     virtual int parseHeader() = 0;

=== modified file 'mixxx/src/soundsourcecoreaudio.cpp'
--- mixxx/src/soundsourcecoreaudio.cpp	2012-11-20 00:40:18 +0000
+++ mixxx/src/soundsourcecoreaudio.cpp	2013-04-21 19:09:03 +0000
@@ -192,7 +192,7 @@
     return filepos;
 }
 
-unsigned int SoundSourceCoreAudio::read(unsigned long size, const SAMPLE *destination) {
+unsigned int SoundSourceCoreAudio::read(unsigned long size, const CSAMPLE *destination) {
     //if (!m_decoder) return 0;
     OSStatus err;
     SAMPLE *destBuffer(const_cast<SAMPLE*>(destination));

=== modified file 'mixxx/src/soundsourcecoreaudio.h'
--- mixxx/src/soundsourcecoreaudio.h	2011-03-09 21:58:35 +0000
+++ mixxx/src/soundsourcecoreaudio.h	2013-04-21 19:09:01 +0000
@@ -48,7 +48,7 @@
     ~SoundSourceCoreAudio();
     int open();
     long seek(long filepos);
-    unsigned read(unsigned long size, const SAMPLE *buffer);
+    unsigned read(unsigned long size, const CSAMPLE *buffer);
     inline long unsigned length();
     int parseHeader();
     static QList<QString> supportedFileExtensions();

=== modified file 'mixxx/src/soundsourceffmpeg.cpp'
--- mixxx/src/soundsourceffmpeg.cpp	2009-05-03 02:34:18 +0000
+++ mixxx/src/soundsourceffmpeg.cpp	2013-04-21 19:04:33 +0000
@@ -317,7 +317,7 @@
    read <size> samples into <destination>, and return the number of
    samples actually read.
  */
-unsigned SoundSourceFFmpeg::read(unsigned long size, const SAMPLE * destination)
+unsigned SoundSourceFFmpeg::read(unsigned long size, const CSAMPLE * destination)
 {
 
     qDebug() << "This code has a bug! It needs fixing before you use it.";

=== modified file 'mixxx/src/soundsourceffmpeg.h'
--- mixxx/src/soundsourceffmpeg.h	2007-07-16 01:45:38 +0000
+++ mixxx/src/soundsourceffmpeg.h	2013-04-21 19:08:58 +0000
@@ -31,7 +31,7 @@
     SoundSourceFFmpeg(QString qFilename);
     ~SoundSourceFFmpeg();
     long seek(long);
-    unsigned read(unsigned long size, const SAMPLE*);
+    unsigned read(unsigned long size, const CSAMPLE*);
     inline long unsigned length();
     static int ParseHeader(TrackInfoObject * );
     bool readInput();

=== modified file 'mixxx/src/soundsourceflac.cpp'
--- mixxx/src/soundsourceflac.cpp	2012-10-31 16:00:40 +0000
+++ mixxx/src/soundsourceflac.cpp	2013-04-21 19:24:04 +0000
@@ -104,9 +104,9 @@
     return filepos;
 }
 
-unsigned int SoundSourceFLAC::read(unsigned long size, const SAMPLE *destination) {
+unsigned int SoundSourceFLAC::read(unsigned long size, const CSAMPLE *destination) {
     if (!m_decoder) return 0;
-    SAMPLE *destBuffer(const_cast<SAMPLE*>(destination));
+    CSAMPLE *destBuffer(const_cast<CSAMPLE*>(destination));
     unsigned int samplesWritten = 0;
     unsigned int i = 0;
     while (samplesWritten < size) {

=== modified file 'mixxx/src/soundsourceflac.h'
--- mixxx/src/soundsourceflac.h	2012-07-08 07:30:32 +0000
+++ mixxx/src/soundsourceflac.h	2013-04-21 19:05:24 +0000
@@ -32,7 +32,7 @@
     ~SoundSourceFLAC();
     int open();
     long seek(long filepos);
-    unsigned read(unsigned long size, const SAMPLE *buffer);
+    unsigned read(unsigned long size, const CSAMPLE *buffer);
     inline long unsigned length();
     int parseHeader();
     static QList<QString> supportedFileExtensions();

=== modified file 'mixxx/src/soundsourcemodplug.cpp'
--- mixxx/src/soundsourcemodplug.cpp	2013-03-18 14:01:27 +0000
+++ mixxx/src/soundsourcemodplug.cpp	2013-04-21 19:05:36 +0000
@@ -134,7 +134,7 @@
 }
 
 unsigned SoundSourceModPlug::read(unsigned long size,
-                                  const SAMPLE* pDestination)
+                                  const CSAMPLE* pDestination)
 {
     unsigned maxLength = m_sampleBuf.length() >> 1;
     unsigned copySamples = math_min(maxLength - m_seekPos, size);

=== modified file 'mixxx/src/soundsourcemodplug.h'
--- mixxx/src/soundsourcemodplug.h	2013-03-19 14:50:49 +0000
+++ mixxx/src/soundsourcemodplug.h	2013-04-21 19:05:48 +0000
@@ -24,7 +24,7 @@
     ~SoundSourceModPlug();
     int open();
     long seek(long);
-    unsigned read(unsigned long size, const SAMPLE*);
+    unsigned read(unsigned long size, const CSAMPLE*);
     inline long unsigned length();
     int parseHeader();
     static QList<QString> supportedFileExtensions();

=== modified file 'mixxx/src/soundsourcemp3.cpp'
--- mixxx/src/soundsourcemp3.cpp	2013-01-19 12:15:22 +0000
+++ mixxx/src/soundsourcemp3.cpp	2013-04-21 19:05:58 +0000
@@ -430,7 +430,7 @@
    read <size> samples into <destination>, and return the number of
    samples actually read.
  */
-unsigned SoundSourceMp3::read(unsigned long samples_wanted, const SAMPLE * _destination)
+unsigned SoundSourceMp3::read(unsigned long samples_wanted, const CSAMPLE * _destination)
 {
     if (!isValid())
         return 0;

=== modified file 'mixxx/src/soundsourcemp3.h'
--- mixxx/src/soundsourcemp3.h	2011-03-27 01:24:06 +0000
+++ mixxx/src/soundsourcemp3.h	2013-04-21 19:06:07 +0000
@@ -55,7 +55,7 @@
     ~SoundSourceMp3();
     int open();
     long seek(long);
-    unsigned read(unsigned long size, const SAMPLE*);
+    unsigned read(unsigned long size, const CSAMPLE*);
     unsigned long discard(unsigned long size);
     /** Return the length of the file in samples. */
     inline long unsigned length();

=== modified file 'mixxx/src/soundsourceoggvorbis.cpp'
--- mixxx/src/soundsourceoggvorbis.cpp	2012-09-06 07:15:26 +0000
+++ mixxx/src/soundsourceoggvorbis.cpp	2013-04-21 19:06:51 +0000
@@ -157,7 +157,7 @@
    samples actually read.
  */
 
-unsigned SoundSourceOggVorbis::read(volatile unsigned long size, const SAMPLE * destination) {
+unsigned SoundSourceOggVorbis::read(volatile unsigned long size, const CSAMPLE * destination) {
     if (size % 2 != 0) {
         qDebug() << "SoundSourceOggVorbis got non-even size in read.";
         size--;

=== modified file 'mixxx/src/soundsourceoggvorbis.h'
--- mixxx/src/soundsourceoggvorbis.h	2011-03-09 21:58:35 +0000
+++ mixxx/src/soundsourceoggvorbis.h	2013-04-21 19:06:59 +0000
@@ -28,7 +28,7 @@
   ~SoundSourceOggVorbis();
   int open();
   long seek(long);
-  unsigned read(unsigned long size, const SAMPLE*);
+  unsigned read(unsigned long size, const CSAMPLE*);
   inline long unsigned length();
   int parseHeader();
   static QList<QString> supportedFileExtensions();

=== modified file 'mixxx/src/soundsourceproxy.cpp'
--- mixxx/src/soundsourceproxy.cpp	2013-04-09 19:14:38 +0000
+++ mixxx/src/soundsourceproxy.cpp	2013-04-21 19:07:13 +0000
@@ -293,7 +293,7 @@
     return m_pSoundSource->seek(l);
 }
 
-unsigned SoundSourceProxy::read(unsigned long size, const SAMPLE * p)
+unsigned SoundSourceProxy::read(unsigned long size, const CSAMPLE * p)
 {
     if (!m_pSoundSource) {
 	return 0;

=== modified file 'mixxx/src/soundsourceproxy.h'
--- mixxx/src/soundsourceproxy.h	2011-03-27 00:50:47 +0000
+++ mixxx/src/soundsourceproxy.h	2013-04-21 19:06:15 +0000
@@ -46,7 +46,7 @@
     static void loadPlugins();
     int open();
     long seek(long);
-    unsigned read(unsigned long size, const SAMPLE*);
+    unsigned read(unsigned long size, const CSAMPLE*);
     long unsigned length();
     int parseHeader();
     static int ParseHeader(TrackInfoObject* p);

=== modified file 'mixxx/src/soundsourcesndfile.cpp'
--- mixxx/src/soundsourcesndfile.cpp	2012-01-07 07:40:11 +0000
+++ mixxx/src/soundsourcesndfile.cpp	2013-04-21 19:06:26 +0000
@@ -104,7 +104,7 @@
    then size/2 samples are read from the mono file, and they are
    doubled into stereo.
  */
-unsigned SoundSourceSndFile::read(unsigned long size, const SAMPLE * destination)
+unsigned SoundSourceSndFile::read(unsigned long size, const CSAMPLE * destination)
 {
     SAMPLE * dest = (SAMPLE *)destination;
     if (filelength > 0)

=== modified file 'mixxx/src/soundsourcesndfile.h'
--- mixxx/src/soundsourcesndfile.h	2011-10-29 18:09:33 +0000
+++ mixxx/src/soundsourcesndfile.h	2013-04-21 19:06:33 +0000
@@ -28,7 +28,7 @@
     ~SoundSourceSndFile();
     int open();
     long seek(long);
-    unsigned read(unsigned long size, const SAMPLE*);
+    unsigned read(unsigned long size, const CSAMPLE*);
     inline long unsigned length();
     int parseHeader();
     static QList<QString> supportedFileExtensions();