comparison src/descriptors.c @ 60:192097e366d1

Minor fixes to descriptors.c (Thanks to Chris Cannam)

 	    case XTRACT_FLATNESS:
 	    case XTRACT_SPREAD:
 	    case XTRACT_POWER:
 	    case XTRACT_HPS:
 	    case XTRACT_PEAK_SPECTRUM:
+	    case XTRACT_MFCC:
 		*data_format = XTRACT_SPECTRAL_MAGNITUDES;
 		break;
 	    case XTRACT_SPECTRAL_INHARMONICITY:
 	    case XTRACT_HARMONIC_SPECTRUM:
 		*data_format = XTRACT_SPECTRAL_PEAKS;

 		*data_format = XTRACT_SPECTRAL_PEAKS_MAGNITUDES;
 		break;
 	    case XTRACT_F0:
 	    case XTRACT_FAILSAFE_F0:
 	    case XTRACT_SPECTRUM:
-	    case XTRACT_MFCC:
 	    case XTRACT_AUTOCORRELATION:
 	    case XTRACT_AUTOCORRELATION_FFT:
 	    case XTRACT_DCT:
 	    case XTRACT_AMDF:
 	    case XTRACT_ASDF:

 	desc = d->algo.desc;
 	p_desc = d->algo.p_desc;
 	author = d->algo.author;
 	year = &d->algo.year;
 
+	strcpy(author, "");
 	*year = 0;
 
 	switch(f){
 	    case XTRACT_MEAN: 
 		strcpy(name, "mean");

 		strcpy(p_desc, 
 			"Extract the spectral peaks from an audio spectrum");
 		strcpy(author, "");
 		break;
 	    case XTRACT_HARMONIC_SPECTRUM:
-		strcpy(p_name, "harmonic_spectrum");
+		strcpy(name, "harmonic_spectrum");
 		strcpy(p_name, "Harmonic Spectrum");
 		strcpy(desc, "Extract the harmonics from a spectrum");
 		strcpy(p_desc, "Extract the harmonics from an audio spectrum");
 		strcpy(author, "");
 		break;

 		strcpy(name, "crest");
 		strcpy(p_name, "Spectral Crest Measure");
 		strcpy(desc, 
 			"Extract the spectral crest measure of a spectrum");
 		strcpy(p_desc, 
-		    "Extract the spectral crest measure of a audio spectrum");
+		    "Extract the spectral crest measure of an audio spectrum");
 		strcpy(author, "Peeters");
 		*year = 2003;
 		break;
 	    case XTRACT_MFCC:
 		strcpy(name, "mfcc");