diff data/fileio/MP3FileReader.h @ 297:c022976d18e8

* Merge from sv-match-alignment branch (excluding alignment-specific document).
  - add aggregate wave model (not yet complete enough to be added as a true
    model in a layer, but there's potential)
  - add play solo mode
  - add alignment model -- unused in plain SV
  - fix two plugin leaks
  - add m3u playlist support (opens all files at once, potentially hazardous)
  - fix retrieval of pre-encoded URLs
  - add ability to resample audio files on import, so as to match rates with
    other files previously loaded; add preference for same
  - add preliminary support in transform code for range and rate of transform
    input
  - reorganise preferences dialog, move dark-background option to preferences,
    add option for temporary directory location

--- a/data/fileio/MP3FileReader.h	Fri Sep 21 09:13:11 2007 +0000
+++ b/data/fileio/MP3FileReader.h	Fri Sep 28 13:56:38 2007 +0000
@@ -35,7 +35,10 @@
         DecodeThreaded // decode in a background thread after construction
     };
 
-    MP3FileReader(QString path, DecodeMode decodeMode, CacheMode cacheMode);
+    MP3FileReader(QString path,
+                  DecodeMode decodeMode,
+                  CacheMode cacheMode,
+                  size_t targetRate = 0);
     virtual ~MP3FileReader();
 
     virtual QString getError() const { return m_error; }
@@ -61,6 +64,8 @@
     bool m_done;
 
     unsigned char *m_filebuffer;
+    float **m_samplebuffer;
+    size_t m_samplebuffersize;
 
     QProgressDialog *m_progress;
     bool m_cancelled;