Mercurial > hg > onsetsds

changeset 6:55d7698f79f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rm some cruft, fix a link
author danstowell
date Thu, 10 Feb 2011 16:23:37 +0000
parents 422c0871839f
children a0afeb85404f
files doc/mainpage.dox mat_oct/onsetsds.c
diffstat 2 files changed, 4 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/doc/mainpage.dox	Thu Feb 10 16:12:12 2011 +0000
+++ b/doc/mainpage.dox	Thu Feb 10 16:23:37 2011 +0000
@@ -22,7 +22,7 @@
 <h2>Download</h2>
 
 <ul>
-	<li><a href="https://sourceforge.net/project/showfiles.php?group_id=210998">Download the sourcecode bundle</a></li>
+	<li><a href="https://sourceforge.net/projects/onsetsds/files/onsetsds/OnsetsDS-source/">Download the sourcecode bundle</a></li>
 	<li>Or access the current development version using subversion [<small><a href="http://sourceforge.net/svn/?group_id=54622" title="What is subversion, and how to use it">info</a></small>]: <br />
 	  <tt>svn co %https://onsetsds.svn.sourceforge.net/svnroot/onsetsds onsetsds</tt></li>
 </ul>
@@ -43,7 +43,7 @@
 OnsetsDS ods;
 
 
-///////// (1) INITIALISATION: /////////
+//-/////// (1) INITIALISATION: ///////-//
 
 // There are various types of onset detector available, we must choose one
 odftype = ODS_ODF_RCOMPLEX;
@@ -55,7 +55,7 @@
 onsetsds_init(&ods, odsdata, ODS_FFT_FFTW3_HC, odftype, 512, 11, 44100.f);
 
 
-///////// (2) EXECUTION:      /////////
+//-/////// (2) EXECUTION:      ///////-//
 
 bool onset;
 while(running){
@@ -66,7 +66,7 @@
 }
 
 
-///////// (3) TIDYING UP:     /////////
+//-/////// (3) TIDYING UP:     ///////-//
 
 free(ods->data); // Or free(odsdata), they point to the same thing in this case
 
--- a/mat_oct/onsetsds.c	Thu Feb 10 16:12:12 2011 +0000
+++ b/mat_oct/onsetsds.c	Thu Feb 10 16:23:37 2011 +0000
@@ -79,26 +79,16 @@
 			packeddata[j+j+1] = (float) imag[frameoffset + j];
 		}
 		bool onset = onsetsds_process(&ods, packeddata);
-//		printf("%i ", onset);
-//		printf("[%i] %i", i, onset);
 		results[i] = (onset ? 1.0 : 0.0);
-//		printf("[%i] %g", i, results[i]);
 	}	
 	
 	// Copy the results from double-array into matlab format
-//	mwSize *dims = (mwSize*) mxCalloc(2, sizeof(mwSize));
-//	dims[0] = 1;
-//	dims[1] = numframes;
-//	mxArray *resultsM = mxCreateNumericArray(2, dims, mxINT8_CLASS, mxREAL);
 	mxArray *resultsM = mxCreateDoubleMatrix(1,numframes,mxREAL);
-//	mxSetPr(resultsM, results);
 	memcpy(mxGetPr(resultsM), results, numframes * sizeof(double));
 	plhs[0] = resultsM;
 	
 	// destroy the ods correctly, and any matlabby things that need to go too.
 	free(ods.data);
 	free(packeddata);
-//	mxFree(dims);
 	mxFree(results);
-	// *resultsM ? no I think that lives on in matlabworld
 }