diff audioio/ClipMixer.h @ 351:36efd75d7b7b tonioni

Merge from default branch
author Chris Cannam
date Wed, 14 May 2014 09:58:27 +0100 (2014-05-14)
parents 8d7f39df44ed
children 72c662fe7ea3
line wrap: on
line diff
--- a/audioio/ClipMixer.h	Thu Apr 03 08:51:30 2014 +0100
+++ b/audioio/ClipMixer.h	Wed May 14 09:58:27 2014 +0100
@@ -36,9 +36,12 @@
 
     /**
      * Load a sample clip from a wav file. This can only happen once:
-     * construct a new ClipMixer if you want a different clip.
+     * construct a new ClipMixer if you want a different clip. The
+     * clip was recorded at a pitch with fundamental frequency clipF0,
+     * and should be scaled by level (in the range 0-1) when playing
+     * back.
      */
-    bool loadClipData(QString clipFilePath, float clipF0);
+    bool loadClipData(QString clipFilePath, float clipF0, float level);
 
     void reset(); // discarding any playing notes