comparison modules-and-plug-ins/python-module/btrack_python_module.cpp @ 15:2b94d3d2fb9d develop

Reformatted comments, removed the OnsetDetectionFunction constructor with no arguments, removed a number of unused variables and made changes to the python module to fix some casting problems and removed some unused variables there also. Still getting the same results, so no overall changes to the algorithm.

     
     // get data as array
     double* data = (double*) PyArray_DATA(arr1);
     
     // get array size
-    int signal_length = PyArray_Size((PyObject*)arr1);
+    long signal_length = PyArray_Size((PyObject*)arr1);
     //int k = (int) theSize;
     
     // get data type 
-    char type = PyArray_DESCR(arr1)->type;
+    //char type = PyArray_DESCR(arr1)->type;
     
     ////////// BEGIN PROCESS ///////////////////
     int hsize = 512;
     int fsize = 1024;
     int df_type = 6;

     
     // get data as array
     double* data = (double*) PyArray_DATA(arr1);
     
     // get array size
-    int signal_length = PyArray_Size((PyObject*)arr1);
+    long signal_length = PyArray_Size((PyObject*)arr1);
     //int k = (int) theSize;
     
     // get data type 
-    char type = PyArray_DESCR(arr1)->type;
+    //char type = PyArray_DESCR(arr1)->type;
     
     ////////// BEGIN PROCESS ///////////////////
     int hsize = 512;
     int fsize = 1024;
     int df_type = 6;

     
     // get data as array
     double* data = (double*) PyArray_DATA(arr1);
     
     // get array size
-    int numframes = PyArray_Size((PyObject*)arr1);
+    long numframes = PyArray_Size((PyObject*)arr1);
     //int k = (int) theSize;
     
     // get data type 
-    char type = PyArray_DESCR(arr1)->type;
+    //char type = PyArray_DESCR(arr1)->type;
     
     ////////// BEGIN PROCESS ///////////////////
     int hsize = 512;
 
     BTrack b;

     float df_val;
     
     ///////////////////////////////////////////
 	//////// Begin Processing Loop ////////////
 	
-	for (int i=0;i < numframes;i++)
+	for (long i=0;i < numframes;i++)
 	{		
         df_val = (float) (data[i] + 0.0001);
         
 		b.process(df_val);				// process df sample in beat tracker