2 files changed, 83 insertions, 7 deletions

diff --git a/swig/java/Makefile.am b/swig/java/Makefile.am
index 1daa68c..31317b7 100644
--- a/swig/java/Makefile.am
+++ b/swig/java/Makefile.am
@@ -1,16 +1,80 @@
+
 javasources = \
-	xtractJNI.java \
-	xtract.java \
 	floatArray.java \
 	SWIGTYPE_p_float.java \
-	SWIGTYPE_p_void.java   
-
+	SWIGTYPE_p_int.java \
+	SWIGTYPE_p_p_float.java \
+	SWIGTYPE_p_unit_.java \
+	SWIGTYPE_p_void.java \
+	xtract_bool_t.java \
+	xtractConstants.java \
+	xtract_feature_init_.java \
+	xtract_features_.java \
+	xtract_feature_types_.java \
+	xtract_function_descriptor_t_algo.java \
+	xtract_function_descriptor_t_argv.java \
+	xtract_function_descriptor_t_data.java \
+	xtract_function_descriptor_t.java \
+	xtract_function_descriptor_t_result.java \
+	xtract_function_descriptor_t_result_scalar.java \
+	xtract_function_descriptor_t_result_vector.java \
+	xtract.java \
+	xtractJNI.java \
+	xtract_lnorm_filter_types_.java \
+	xtract_mel_filter.java \
+	xtract_mfcc_types_.java \
+	xtract_return_codes_.java \
+	xtract_spectrum_.java \
+	xtract_type_t.java \
+	xtract_unit_t.java \
+	xtract_vector_t.java \
+	xtract_window_types_.java 
+	
 javaclasses = \
-	xtractJNI.class \
-	xtract.class \
 	floatArray.class \
 	SWIGTYPE_p_float.class \
-	SWIGTYPE_p_void.class   
+	SWIGTYPE_p_int.class \
+	SWIGTYPE_p_p_float.class \
+	SWIGTYPE_p_unit_.class \
+	SWIGTYPE_p_void.class \
+	xtract_bool_t.class \
+	xtractConstants.class \
+	xtract_feature_init_.class \
+	xtract_features_.class \
+	xtract_feature_types_.class \
+	xtract_function_descriptor_t_algo.class \
+	xtract_function_descriptor_t_argv.class \
+	xtract_function_descriptor_t_data.class \
+	xtract_function_descriptor_t.class \
+	xtract_function_descriptor_t_result.class \
+	xtract_function_descriptor_t_result_scalar.class \
+	xtract_function_descriptor_t_result_vector.class \
+	xtract.class \
+	xtractJNI.class \
+	xtract_lnorm_filter_types_.class \
+	xtract_mel_filter.class \
+	xtract_mfcc_types_.class \
+	xtract_return_codes_.class \
+	xtract_spectrum_.class \
+	xtract_type_t.class \
+	xtract_unit_t.class \
+	xtract_vector_t.class \
+	xtract_window_types_.class 
+	
+
+#javasources = \
+#	xtractJNI.java \
+#	xtract.java \
+#	floatArray.java \
+#	SWIGTYPE_p_float.java \
+#	SWIGTYPE_p_void.java   
+
+#javaclasses = \
+#	xtractJNI.class \
+#	xtract.class \
+#	floatArray.class \
+#	SWIGTYPE_p_float.class \
+#	SWIGTYPE_p_void.class   
 
 MAINTAINERCLEANFILES = $(javasources) Makefile.in
 
diff --git a/swig/python/test.py b/swig/python/test.py
index f7297f8..923adb7 100644
--- a/swig/python/test.py
+++ b/swig/python/test.py
@@ -34,4 +34,16 @@ xtract.xtract_spectrum(a,len,argv, result)
 for i in range(len):
     print result[i]
 
+
+print 'Computing windowed subframes...'
+
+for i in range(0, len):
+    a[i] = 1.0
+
+window = xtract.xtract_init_window(len / 2, xtract.XTRACT_HANN)
+xtract.xtract_features_from_subframes(a, len, xtract.XTRACT_WINDOWED, window, result) 
+
+for i in range(len):
+    print result[i]
+
 print '\nFinished!\n'