comparison dsp/segmentation/cluster_segmenter.h @ 505:930b5b0f707d

Merge branch 'codestyle-and-tidy'

-#ifndef _CLUSTER_SEGMENTER_H
-#define _CLUSTER_SEGMENTER_H
-
+/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
 /*
  *  cluster_segmenter.h
  *  soundbite
  *
  *  Created by Mark Levy on 06/04/2006.

     License, or (at your option) any later version.  See the file
     COPYING included with this distribution for more information.
  *
  */
 
+#ifndef QM_DSP_CLUSTER_SEGMENTER_H
+#define QM_DSP_CLUSTER_SEGMENTER_H
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <float.h>
 

 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* applies MPEG-7 normalisation to constant-Q features, storing normalised envelope (norm) in last feature dimension */
+/* 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);
 
 /* converts constant-Q features to normalised chroma */
 void cq2chroma(double** cq, int nframes, int ncoeff, int bins, double** chroma);
 
 void create_histograms(int* x, int nx, int m, int hlen, double* h);
 
-void cluster_segment(int* q, double** features, int frames_read, int feature_length, int nHMM_states, 
-					 int histogram_length, int nclusters, int neighbour_limit);
+void cluster_segment(int* q, double** features, int frames_read,
+                     int feature_length, int nHMM_states, 
+                     int histogram_length, int nclusters,
+                     int neighbour_limit);
 
-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);
+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