comparison audioio/ClipMixer.cpp @ 351:36efd75d7b7b tonioni

Merge from default branch

 {
     m_channels = channels;
 }
 
 bool
-ClipMixer::loadClipData(QString path, float f0)
+ClipMixer::loadClipData(QString path, float f0, float level)
 {
     if (m_clipData) {
         cerr << "ClipMixer::loadClipData: Already have clip loaded" << endl;
         return false;
     }

 
     for (i = 0; i < info.frames; ++i) {
 	int j;
 	m_clipData[i] = 0.0f;
 	for (j = 0; j < info.channels; ++j) {
-	    m_clipData[i] += tmpFrames[i * info.channels + j];
+	    m_clipData[i] += tmpFrames[i * info.channels + j] * level;
 	}
     }
 
     free(tmpFrames);
 

     float *levels = new float[m_channels];
 
     foreach (NoteStart note, m_playing) {
 
         for (int c = 0; c < m_channels; ++c) {
-            levels[c] = gain;
+            levels[c] = note.level * gain;
         }
         if (note.pan != 0.0 && m_channels == 2) {
             levels[0] *= 1.0 - note.pan;
             levels[1] *= note.pan + 1.0;
         }