comparison layer/SpectrogramLayer.cpp @ 65:7f608ec9a061

* More structural work on feature extraction plugin C <-> C++ adapter
* Allow use of LADSPA/DSSI plugins with control outputs as feature extraction
  plugins (DSSI with MIDI output still to come)
* Reorder labels on spectrogram status box
* Minor tweaks in doc etc.

 					adjFreqMin, adjFreqMax)) {
 	    return "";
 	}
 
 	if (adjFreqMin != adjFreqMax) {
-	    adjFreqText = tr("Adjusted Frequency:\t%1 - %2 Hz\n")
+	    adjFreqText = tr("Peak Frequency:\t%1 - %2 Hz\n")
 		.arg(adjFreqMin).arg(adjFreqMax);
 	} else {
-	    adjFreqText = tr("Adjusted Frequency:\t%1 Hz\n")
+	    adjFreqText = tr("Peak Frequency:\t%1 Hz\n")
 		.arg(adjFreqMin);
 	}
 
 	QString pmin = Pitch::getPitchLabelForFrequency(adjFreqMin);
 	QString pmax = Pitch::getPitchLabelForFrequency(adjFreqMax);
 
 	if (pmin != pmax) {
-	    adjPitchText = tr("Adjusted Pitch:\t%3 - %4\n").arg(pmin).arg(pmax);
+	    adjPitchText = tr("Peak Pitch:\t%3 - %4\n").arg(pmin).arg(pmax);
 	} else {
-	    adjPitchText = tr("Adjusted Pitch:\t%2\n").arg(pmin);
+	    adjPitchText = tr("Peak Pitch:\t%2\n").arg(pmin);
 	}
 
     } else {
 	
 	if (!getYBinSourceRange(v, y, freqMin, freqMax)) return "";

 	text += tr("Time:\t%1\n")
 	    .arg(rtMin.toText(true).c_str());
     }
 
     if (freqMin != freqMax) {
-	text += tr("Frequency:\t%1 - %2 Hz\n%3Pitch:\t%4 - %5\n%6")
+	text += tr("%1Bin Frequency:\t%2 - %3 Hz\n%4Bin Pitch:\t%5 - %6\n")
+	    .arg(adjFreqText)
 	    .arg(freqMin)
 	    .arg(freqMax)
+	    .arg(adjPitchText)
+	    .arg(Pitch::getPitchLabelForFrequency(freqMin))
+	    .arg(Pitch::getPitchLabelForFrequency(freqMax));
+    } else {
+	text += tr("%1Bin Frequency:\t%2 Hz\n%3Bin Pitch:\t%4\n")
 	    .arg(adjFreqText)
-	    .arg(Pitch::getPitchLabelForFrequency(freqMin))
-	    .arg(Pitch::getPitchLabelForFrequency(freqMax))
-	    .arg(adjPitchText);
-    } else {
-	text += tr("Frequency:\t%1 Hz\n%2Pitch:\t%3\n%4")
 	    .arg(freqMin)
-	    .arg(adjFreqText)
-	    .arg(Pitch::getPitchLabelForFrequency(freqMin))
-	    .arg(adjPitchText);
+	    .arg(adjPitchText)
+	    .arg(Pitch::getPitchLabelForFrequency(freqMin));
     }	
 
     if (haveValues) {
 	float dbMin = AudioLevel::multiplier_to_dB(magMin);
 	float dbMax = AudioLevel::multiplier_to_dB(magMax);