Mercurial > hg > qm-dsp

diff dsp/segmentation/cluster_segmenter.h @ 245:cdfd0948a852

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* First cut at properly integrating the segmenter and making it work right
author Chris Cannam <c.cannam@qmul.ac.uk>
date Wed, 09 Jan 2008 16:50:04 +0000
parents dc30e3864ceb
children e5907ae6de17
line wrap: on
line diff
--- a/dsp/segmentation/cluster_segmenter.h	Wed Jan 09 10:48:08 2008 +0000
+++ b/dsp/segmentation/cluster_segmenter.h	Wed Jan 09 16:50:04 2008 +0000
@@ -17,8 +17,12 @@
 
 #include "segment.h"
 #include "cluster_melt.h"
-#include "hmm.h"
-#include "pca.h"
+#include "hmm/hmm.h"
+#include "maths/pca/pca.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* applies MPEG-7 normalisation to constant-Q features, storing normalised envelope (norm) in last feature dimension */
 void mpeg7_constq(double** features, int nframes, int ncoeff);
@@ -34,5 +38,8 @@
 void constq_segment(int* q, double** features, int frames_read, int bins, int ncoeff, int feature_type, 
 			 int nHMM_states, int histogram_length, int nclusters, int neighbour_limit);
 
+#ifdef __cplusplus
+}
+#endif
 
-#endif
\ No newline at end of file
+#endif