comparison audioio/ClipMixer.cpp @ 404:08a45e4cf1b1 tonioni

Update subrepos and merge from default branch
author Chris Cannam
date Tue, 02 Sep 2014 16:23:48 +0100
parents f747be6743ab
children b0b49da13975
comparison
equal deleted inserted replaced
384:ad33fdc4ad92 404:08a45e4cf1b1
128 } 128 }
129 129
130 std::vector<NoteStart> remaining; 130 std::vector<NoteStart> remaining;
131 131
132 float *levels = new float[m_channels]; 132 float *levels = new float[m_channels];
133
134 #ifdef DEBUG_CLIP_MIXER
135 cerr << "ClipMixer::mix: have " << m_playing.size() << " playing note(s)"
136 << " and " << endingNotes.size() << " note(s) ending here"
137 << endl;
138 #endif
133 139
134 foreach (NoteStart note, m_playing) { 140 foreach (NoteStart note, m_playing) {
135 141
136 for (int c = 0; c < m_channels; ++c) { 142 for (int c = 0; c < m_channels; ++c) {
137 levels[c] = note.level * gain; 143 levels[c] = note.level * gain;