# HG changeset patch
# User Chris Cannam
# Date 1308667312 -3600
# Node ID c30b9720bde0aabbd51dd23a1b620c6f16b73d76
# Parent  d40b62a2006f6b12e1785560c63bba3da2609c36
Add proper support and tests for window type parameter (requires latest update to Vamp host SDK)

diff -r d40b62a2006f -r c30b9720bde0 runner/FeatureExtractionManager.cpp
--- a/runner/FeatureExtractionManager.cpp	Wed Jun 15 15:39:08 2011 +0100
+++ b/runner/FeatureExtractionManager.cpp	Tue Jun 21 15:41:52 2011 +0100
@@ -116,6 +116,30 @@
     return true;
 }
 
+static PluginInputDomainAdapter::WindowType
+convertWindowType(WindowType t)
+{
+    switch (t) {
+    case RectangularWindow:
+        return PluginInputDomainAdapter::RectangularWindow;
+    case BartlettWindow:
+        return PluginInputDomainAdapter::BartlettWindow;
+    case HammingWindow:
+        return PluginInputDomainAdapter::HammingWindow;
+    case HanningWindow:
+        return PluginInputDomainAdapter::HanningWindow;
+    case BlackmanWindow:
+        return PluginInputDomainAdapter::BlackmanWindow;
+    case NuttallWindow:
+        return PluginInputDomainAdapter::NuttallWindow;
+    case BlackmanHarrisWindow:
+        return PluginInputDomainAdapter::BlackmanHarrisWindow;
+    default:
+        cerr << "ERROR: Unknown or unsupported window type \"" << t << "\", using Hann (\"" << HanningWindow << "\")" << endl;
+        return PluginInputDomainAdapter::HanningWindow;
+    }
+}
+
 bool FeatureExtractionManager::addFeatureExtractor
 (Transform transform, const vector<FeatureWriter*> &writers)
 {
@@ -210,8 +234,13 @@
 
             // adapt the plugin for buffering, channels, etc.
             if (plugin->getInputDomain() == Plugin::FrequencyDomain) {
+
                 pida = new PluginInputDomainAdapter(plugin);
                 pida->setProcessTimestampMethod(PluginInputDomainAdapter::ShiftData);
+
+                PluginInputDomainAdapter::WindowType wtype =
+                    convertWindowType(transform.getWindowType());
+                pida->setWindowType(wtype);
                 plugin = pida;
             }
 
diff -r d40b62a2006f -r c30b9720bde0 tests/expected/transforms-basic-percussiononsets-df-windowtype-default.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/expected/transforms-basic-percussiononsets-df-windowtype-default.csv	Tue Jun 21 15:41:52 2011 +0100
@@ -0,0 +1,448 @@
+"./audio/3clicks8.wav",0.000000000,0
+,0.011609977,207
+,0.023219954,170
+,0.034829931,184
+,0.046439909,166
+,0.058049886,174
+,0.069659863,179
+,0.081269841,162
+,0.092879818,157
+,0.104489795,156
+,0.116099773,182
+,0.127709750,168
+,0.139319727,168
+,0.150929705,155
+,0.162539682,200
+,0.174149659,163
+,0.185759637,178
+,0.197369614,164
+,0.208979591,166
+,0.220589569,137
+,0.232199546,155
+,0.243809523,177
+,0.255419501,145
+,0.267029478,172
+,0.278639455,155
+,0.290249433,201
+,0.301859410,166
+,0.313469387,169
+,0.325079365,158
+,0.336689342,169
+,0.348299319,155
+,0.359909297,187
+,0.371519274,177
+,0.383129251,149
+,0.394739229,196
+,0.406349206,160
+,0.417959183,174
+,0.429569160,165
+,0.441179138,149
+,0.452789115,181
+,0.464399092,180
+,0.476009070,156
+,0.487619047,163
+,0.499229024,188
+,0.510839002,173
+,0.522448979,160
+,0.534058956,168
+,0.545668934,154
+,0.557278911,155
+,0.568888888,161
+,0.580498866,163
+,0.592108843,172
+,0.603718820,168
+,0.615328798,181
+,0.626938775,167
+,0.638548752,172
+,0.650158730,158
+,0.661768707,172
+,0.673378684,167
+,0.684988662,180
+,0.696598639,188
+,0.708208616,160
+,0.719818594,166
+,0.731428571,158
+,0.743038548,176
+,0.754648526,153
+,0.766258503,173
+,0.777868480,449
+,0.789478458,30
+,0.801088435,70
+,0.812698412,181
+,0.824308390,165
+,0.835918367,174
+,0.847528344,181
+,0.859138321,179
+,0.870748299,154
+,0.882358276,169
+,0.893968253,150
+,0.905578231,189
+,0.917188208,159
+,0.928798185,172
+,0.940408163,157
+,0.952018140,167
+,0.963628117,169
+,0.975238095,155
+,0.986848072,189
+,0.998458049,178
+,1.010068027,168
+,1.021678004,169
+,1.033287981,178
+,1.044897959,157
+,1.056507936,166
+,1.068117913,162
+,1.079727891,170
+,1.091337868,186
+,1.102947845,178
+,1.114557823,178
+,1.126167800,155
+,1.137777777,173
+,1.149387755,156
+,1.160997732,158
+,1.172607709,170
+,1.184217687,167
+,1.195827664,160
+,1.207437641,180
+,1.219047619,153
+,1.230657596,154
+,1.242267573,171
+,1.253877551,159
+,1.265487528,194
+,1.277097505,170
+,1.288707482,157
+,1.300317460,184
+,1.311927437,156
+,1.323537414,173
+,1.335147392,184
+,1.346757369,168
+,1.358367346,182
+,1.369977324,147
+,1.381587301,164
+,1.393197278,163
+,1.404807256,165
+,1.416417233,181
+,1.428027210,172
+,1.439637188,169
+,1.451247165,165
+,1.462857142,166
+,1.474467120,158
+,1.486077097,162
+,1.497687074,188
+,1.509297052,176
+,1.520907029,176
+,1.532517006,159
+,1.544126984,183
+,1.555736961,178
+,1.567346938,168
+,1.578956916,171
+,1.590566893,158
+,1.602176870,153
+,1.613786848,189
+,1.625396825,171
+,1.637006802,142
+,1.648616780,503
+,1.660226757,0
+,1.671836734,30
+,1.683446712,189
+,1.695056689,146
+,1.706666666,174
+,1.718276643,171
+,1.729886621,169
+,1.741496598,164
+,1.753106575,181
+,1.764716553,180
+,1.776326530,163
+,1.787936507,174
+,1.799546485,135
+,1.811156462,193
+,1.822766439,187
+,1.834376417,176
+,1.845986394,172
+,1.857596371,155
+,1.869206349,185
+,1.880816326,167
+,1.892426303,173
+,1.904036281,162
+,1.915646258,166
+,1.927256235,167
+,1.938866213,179
+,1.950476190,170
+,1.962086167,158
+,1.973696145,168
+,1.985306122,162
+,1.996916099,182
+,2.008526077,167
+,2.020136054,185
+,2.031746031,165
+,2.043356009,184
+,2.054965986,157
+,2.066575963,167
+,2.078185941,164
+,2.089795918,160
+,2.101405895,181
+,2.113015873,165
+,2.124625850,181
+,2.136235827,161
+,2.147845804,176
+,2.159455782,177
+,2.171065759,150
+,2.182675736,185
+,2.194285714,173
+,2.205895691,162
+,2.217505668,169
+,2.229115646,171
+,2.240725623,140
+,2.252335600,196
+,2.263945578,155
+,2.275555555,171
+,2.287165532,186
+,2.298775510,157
+,2.310385487,166
+,2.321995464,169
+,2.333605442,183
+,2.345215419,186
+,2.356825396,138
+,2.368435374,162
+,2.380045351,180
+,2.391655328,165
+,2.403265306,181
+,2.414875283,444
+,2.426485260,27
+,2.438095238,150
+,2.449705215,166
+,2.461315192,177
+,2.472925170,174
+,2.484535147,165
+,2.496145124,158
+,2.507755102,178
+,2.519365079,177
+,2.530975056,172
+,2.542585034,174
+,2.554195011,168
+,2.565804988,165
+,2.577414965,168
+,2.589024943,149
+,2.600634920,171
+,2.612244897,164
+,2.623854875,163
+,2.635464852,182
+,2.647074829,162
+,2.658684807,156
+,2.670294784,173
+,2.681904761,188
+,2.693514739,166
+,2.705124716,157
+,2.716734693,170
+,2.728344671,167
+,2.739954648,191
+,2.751564625,154
+,2.763174603,175
+,2.774784580,157
+,2.786394557,169
+,2.798004535,160
+,2.809614512,163
+,2.821224489,191
+,2.832834467,158
+,2.844444444,184
+,2.856054421,164
+,2.867664399,176
+,2.879274376,182
+,2.890884353,180
+,2.902494331,138
+,2.914104308,170
+,2.925714285,172
+,2.937324263,172
+,2.948934240,168
+,2.960544217,186
+,2.972154195,171
+,2.983764172,154
+,2.995374149,185
+,3.006984126,172
+,3.018594104,164
+,3.030204081,176
+,3.041814058,195
+,3.053424036,160
+,3.065034013,124
+,3.076643990,181
+,3.088253968,170
+,3.099863945,178
+,3.111473922,165
+,3.123083900,164
+,3.134693877,194
+,3.146303854,157
+,3.157913832,205
+,3.169523809,163
+,3.181133786,159
+,3.192743764,184
+,3.204353741,145
+,3.215963718,170
+,3.227573696,155
+,3.239183673,161
+,3.250793650,164
+,3.262403628,184
+,3.274013605,175
+,3.285623582,155
+,3.297233560,164
+,3.308843537,181
+,3.320453514,182
+,3.332063492,145
+,3.343673469,177
+,3.355283446,162
+,3.366893424,153
+,3.378503401,185
+,3.390113378,174
+,3.401723356,167
+,3.413333333,187
+,3.424943310,157
+,3.436553287,170
+,3.448163265,169
+,3.459773242,166
+,3.471383219,171
+,3.482993197,165
+,3.494603174,158
+,3.506213151,181
+,3.517823129,168
+,3.529433106,175
+,3.541043083,162
+,3.552653061,167
+,3.564263038,179
+,3.575873015,167
+,3.587482993,156
+,3.599092970,209
+,3.610702947,179
+,3.622312925,159
+,3.633922902,180
+,3.645532879,152
+,3.657142857,169
+,3.668752834,189
+,3.680362811,170
+,3.691972789,156
+,3.703582766,165
+,3.715192743,179
+,3.726802721,173
+,3.738412698,163
+,3.750022675,170
+,3.761632653,181
+,3.773242630,177
+,3.784852607,181
+,3.796462585,166
+,3.808072562,153
+,3.819682539,164
+,3.831292517,209
+,3.842902494,159
+,3.854512471,194
+,3.866122448,164
+,3.877732426,184
+,3.889342403,163
+,3.900952380,173
+,3.912562358,165
+,3.924172335,164
+,3.935782312,182
+,3.947392290,170
+,3.959002267,160
+,3.970612244,173
+,3.982222222,160
+,3.993832199,174
+,4.005442176,179
+,4.017052154,179
+,4.028662131,145
+,4.040272108,196
+,4.051882086,155
+,4.063492063,170
+,4.075102040,180
+,4.086712018,156
+,4.098321995,159
+,4.109931972,182
+,4.121541950,175
+,4.133151927,173
+,4.144761904,164
+,4.156371882,186
+,4.167981859,160
+,4.179591836,175
+,4.191201814,178
+,4.202811791,159
+,4.214421768,177
+,4.226031746,181
+,4.237641723,177
+,4.249251700,163
+,4.260861678,158
+,4.272471655,188
+,4.284081632,163
+,4.295691609,158
+,4.307301587,164
+,4.318911564,164
+,4.330521541,183
+,4.342131519,160
+,4.353741496,182
+,4.365351473,172
+,4.376961451,172
+,4.388571428,179
+,4.400181405,154
+,4.411791383,166
+,4.423401360,174
+,4.435011337,156
+,4.446621315,174
+,4.458231292,169
+,4.469841269,169
+,4.481451247,178
+,4.493061224,175
+,4.504671201,193
+,4.516281179,153
+,4.527891156,160
+,4.539501133,176
+,4.551111111,167
+,4.562721088,184
+,4.574331065,163
+,4.585941043,150
+,4.597551020,156
+,4.609160997,182
+,4.620770975,168
+,4.632380952,168
+,4.643990929,152
+,4.655600907,174
+,4.667210884,186
+,4.678820861,168
+,4.690430839,173
+,4.702040816,184
+,4.713650793,169
+,4.725260770,166
+,4.736870748,164
+,4.748480725,193
+,4.760090702,155
+,4.771700680,164
+,4.783310657,181
+,4.794920634,142
+,4.806530612,183
+,4.818140589,181
+,4.829750566,185
+,4.841360544,171
+,4.852970521,184
+,4.864580498,156
+,4.876190476,162
+,4.887800453,182
+,4.899410430,161
+,4.911020408,175
+,4.922630385,168
+,4.934240362,172
+,4.945850340,151
+,4.957460317,176
+,4.969070294,171
+,4.980680272,93
+,4.992290249,0
+,5.003900226,0
+,5.015510204,0
+,5.027120181,0
+,5.038730158,0
+,5.050340136,0
+,5.061950113,0
+,5.073560090,0
+,5.085170068,0
+,5.096780045,0
+,5.108390022,0
+,5.120000000,0
+,5.131609977,0
+,5.143219954,0
+,5.154829931,0
+,5.166439909,0
+,5.178049886,0
+,5.189659863,0
diff -r d40b62a2006f -r c30b9720bde0 tests/expected/transforms-basic-percussiononsets-df-windowtype-hamming.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/expected/transforms-basic-percussiononsets-df-windowtype-hamming.csv	Tue Jun 21 15:41:52 2011 +0100
@@ -0,0 +1,448 @@
+"./audio/3clicks8.wav",0.000000000,0
+,0.011609977,209
+,0.023219954,168
+,0.034829931,177
+,0.046439909,164
+,0.058049886,169
+,0.069659863,176
+,0.081269841,162
+,0.092879818,154
+,0.104489795,160
+,0.116099773,181
+,0.127709750,172
+,0.139319727,165
+,0.150929705,151
+,0.162539682,200
+,0.174149659,161
+,0.185759637,171
+,0.197369614,164
+,0.208979591,165
+,0.220589569,138
+,0.232199546,150
+,0.243809523,176
+,0.255419501,151
+,0.267029478,168
+,0.278639455,157
+,0.290249433,201
+,0.301859410,171
+,0.313469387,171
+,0.325079365,166
+,0.336689342,169
+,0.348299319,161
+,0.359909297,191
+,0.371519274,179
+,0.383129251,148
+,0.394739229,189
+,0.406349206,157
+,0.417959183,176
+,0.429569160,163
+,0.441179138,153
+,0.452789115,178
+,0.464399092,185
+,0.476009070,163
+,0.487619047,152
+,0.499229024,186
+,0.510839002,168
+,0.522448979,161
+,0.534058956,170
+,0.545668934,158
+,0.557278911,150
+,0.568888888,161
+,0.580498866,163
+,0.592108843,173
+,0.603718820,169
+,0.615328798,188
+,0.626938775,165
+,0.638548752,177
+,0.650158730,156
+,0.661768707,172
+,0.673378684,164
+,0.684988662,178
+,0.696598639,184
+,0.708208616,161
+,0.719818594,169
+,0.731428571,157
+,0.743038548,176
+,0.754648526,155
+,0.766258503,173
+,0.777868480,450
+,0.789478458,29
+,0.801088435,55
+,0.812698412,184
+,0.824308390,155
+,0.835918367,168
+,0.847528344,184
+,0.859138321,175
+,0.870748299,156
+,0.882358276,166
+,0.893968253,148
+,0.905578231,183
+,0.917188208,160
+,0.928798185,174
+,0.940408163,161
+,0.952018140,170
+,0.963628117,167
+,0.975238095,156
+,0.986848072,189
+,0.998458049,181
+,1.010068027,169
+,1.021678004,168
+,1.033287981,171
+,1.044897959,160
+,1.056507936,164
+,1.068117913,168
+,1.079727891,170
+,1.091337868,181
+,1.102947845,177
+,1.114557823,162
+,1.126167800,158
+,1.137777777,180
+,1.149387755,156
+,1.160997732,150
+,1.172607709,170
+,1.184217687,169
+,1.195827664,160
+,1.207437641,175
+,1.219047619,159
+,1.230657596,152
+,1.242267573,169
+,1.253877551,159
+,1.265487528,190
+,1.277097505,166
+,1.288707482,152
+,1.300317460,183
+,1.311927437,162
+,1.323537414,169
+,1.335147392,176
+,1.346757369,168
+,1.358367346,180
+,1.369977324,147
+,1.381587301,164
+,1.393197278,160
+,1.404807256,165
+,1.416417233,181
+,1.428027210,171
+,1.439637188,165
+,1.451247165,167
+,1.462857142,167
+,1.474467120,154
+,1.486077097,167
+,1.497687074,189
+,1.509297052,172
+,1.520907029,169
+,1.532517006,153
+,1.544126984,179
+,1.555736961,175
+,1.567346938,178
+,1.578956916,169
+,1.590566893,156
+,1.602176870,157
+,1.613786848,183
+,1.625396825,171
+,1.637006802,142
+,1.648616780,503
+,1.660226757,0
+,1.671836734,23
+,1.683446712,181
+,1.695056689,147
+,1.706666666,174
+,1.718276643,174
+,1.729886621,156
+,1.741496598,161
+,1.753106575,171
+,1.764716553,185
+,1.776326530,167
+,1.787936507,170
+,1.799546485,126
+,1.811156462,191
+,1.822766439,185
+,1.834376417,176
+,1.845986394,175
+,1.857596371,153
+,1.869206349,176
+,1.880816326,165
+,1.892426303,177
+,1.904036281,165
+,1.915646258,158
+,1.927256235,163
+,1.938866213,175
+,1.950476190,169
+,1.962086167,158
+,1.973696145,170
+,1.985306122,161
+,1.996916099,188
+,2.008526077,168
+,2.020136054,187
+,2.031746031,168
+,2.043356009,193
+,2.054965986,160
+,2.066575963,166
+,2.078185941,164
+,2.089795918,164
+,2.101405895,182
+,2.113015873,167
+,2.124625850,174
+,2.136235827,165
+,2.147845804,171
+,2.159455782,173
+,2.171065759,153
+,2.182675736,179
+,2.194285714,178
+,2.205895691,158
+,2.217505668,165
+,2.229115646,173
+,2.240725623,137
+,2.252335600,186
+,2.263945578,154
+,2.275555555,164
+,2.287165532,187
+,2.298775510,155
+,2.310385487,162
+,2.321995464,166
+,2.333605442,180
+,2.345215419,184
+,2.356825396,143
+,2.368435374,161
+,2.380045351,175
+,2.391655328,162
+,2.403265306,253
+,2.414875283,435
+,2.426485260,33
+,2.438095238,56
+,2.449705215,166
+,2.461315192,173
+,2.472925170,170
+,2.484535147,155
+,2.496145124,154
+,2.507755102,175
+,2.519365079,181
+,2.530975056,172
+,2.542585034,169
+,2.554195011,164
+,2.565804988,174
+,2.577414965,169
+,2.589024943,142
+,2.600634920,166
+,2.612244897,164
+,2.623854875,165
+,2.635464852,185
+,2.647074829,166
+,2.658684807,155
+,2.670294784,172
+,2.681904761,181
+,2.693514739,161
+,2.705124716,160
+,2.716734693,163
+,2.728344671,160
+,2.739954648,189
+,2.751564625,148
+,2.763174603,175
+,2.774784580,154
+,2.786394557,169
+,2.798004535,159
+,2.809614512,162
+,2.821224489,189
+,2.832834467,160
+,2.844444444,182
+,2.856054421,158
+,2.867664399,181
+,2.879274376,182
+,2.890884353,178
+,2.902494331,146
+,2.914104308,171
+,2.925714285,167
+,2.937324263,167
+,2.948934240,169
+,2.960544217,182
+,2.972154195,174
+,2.983764172,156
+,2.995374149,186
+,3.006984126,169
+,3.018594104,166
+,3.030204081,169
+,3.041814058,189
+,3.053424036,161
+,3.065034013,127
+,3.076643990,182
+,3.088253968,163
+,3.099863945,172
+,3.111473922,162
+,3.123083900,155
+,3.134693877,191
+,3.146303854,152
+,3.157913832,205
+,3.169523809,165
+,3.181133786,152
+,3.192743764,181
+,3.204353741,155
+,3.215963718,174
+,3.227573696,151
+,3.239183673,156
+,3.250793650,168
+,3.262403628,178
+,3.274013605,178
+,3.285623582,159
+,3.297233560,163
+,3.308843537,181
+,3.320453514,184
+,3.332063492,146
+,3.343673469,176
+,3.355283446,160
+,3.366893424,138
+,3.378503401,189
+,3.390113378,174
+,3.401723356,164
+,3.413333333,184
+,3.424943310,161
+,3.436553287,167
+,3.448163265,164
+,3.459773242,167
+,3.471383219,166
+,3.482993197,168
+,3.494603174,163
+,3.506213151,177
+,3.517823129,163
+,3.529433106,170
+,3.541043083,160
+,3.552653061,175
+,3.564263038,178
+,3.575873015,159
+,3.587482993,151
+,3.599092970,204
+,3.610702947,175
+,3.622312925,161
+,3.633922902,178
+,3.645532879,146
+,3.657142857,170
+,3.668752834,187
+,3.680362811,167
+,3.691972789,163
+,3.703582766,172
+,3.715192743,174
+,3.726802721,170
+,3.738412698,158
+,3.750022675,173
+,3.761632653,180
+,3.773242630,173
+,3.784852607,183
+,3.796462585,168
+,3.808072562,150
+,3.819682539,162
+,3.831292517,205
+,3.842902494,159
+,3.854512471,186
+,3.866122448,163
+,3.877732426,182
+,3.889342403,158
+,3.900952380,174
+,3.912562358,163
+,3.924172335,159
+,3.935782312,171
+,3.947392290,167
+,3.959002267,154
+,3.970612244,173
+,3.982222222,162
+,3.993832199,170
+,4.005442176,180
+,4.017052154,182
+,4.028662131,146
+,4.040272108,196
+,4.051882086,151
+,4.063492063,171
+,4.075102040,180
+,4.086712018,163
+,4.098321995,155
+,4.109931972,177
+,4.121541950,172
+,4.133151927,176
+,4.144761904,163
+,4.156371882,184
+,4.167981859,162
+,4.179591836,165
+,4.191201814,182
+,4.202811791,162
+,4.214421768,171
+,4.226031746,180
+,4.237641723,176
+,4.249251700,161
+,4.260861678,167
+,4.272471655,181
+,4.284081632,163
+,4.295691609,155
+,4.307301587,161
+,4.318911564,164
+,4.330521541,186
+,4.342131519,163
+,4.353741496,180
+,4.365351473,170
+,4.376961451,168
+,4.388571428,173
+,4.400181405,156
+,4.411791383,163
+,4.423401360,176
+,4.435011337,151
+,4.446621315,170
+,4.458231292,171
+,4.469841269,169
+,4.481451247,178
+,4.493061224,174
+,4.504671201,191
+,4.516281179,156
+,4.527891156,163
+,4.539501133,176
+,4.551111111,166
+,4.562721088,178
+,4.574331065,160
+,4.585941043,150
+,4.597551020,162
+,4.609160997,179
+,4.620770975,170
+,4.632380952,165
+,4.643990929,151
+,4.655600907,178
+,4.667210884,188
+,4.678820861,162
+,4.690430839,172
+,4.702040816,179
+,4.713650793,170
+,4.725260770,166
+,4.736870748,155
+,4.748480725,198
+,4.760090702,162
+,4.771700680,162
+,4.783310657,184
+,4.794920634,142
+,4.806530612,183
+,4.818140589,184
+,4.829750566,185
+,4.841360544,171
+,4.852970521,177
+,4.864580498,155
+,4.876190476,158
+,4.887800453,178
+,4.899410430,162
+,4.911020408,174
+,4.922630385,174
+,4.934240362,175
+,4.945850340,151
+,4.957460317,177
+,4.969070294,170
+,4.980680272,90
+,4.992290249,0
+,5.003900226,0
+,5.015510204,0
+,5.027120181,0
+,5.038730158,0
+,5.050340136,0
+,5.061950113,0
+,5.073560090,0
+,5.085170068,0
+,5.096780045,0
+,5.108390022,0
+,5.120000000,0
+,5.131609977,0
+,5.143219954,0
+,5.154829931,0
+,5.166439909,0
+,5.178049886,0
+,5.189659863,0
diff -r d40b62a2006f -r c30b9720bde0 tests/expected/transforms-basic-percussiononsets-df-windowtype-hanning.csv
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/expected/transforms-basic-percussiononsets-df-windowtype-hanning.csv	Tue Jun 21 15:41:52 2011 +0100
@@ -0,0 +1,448 @@
+"./audio/3clicks8.wav",0.000000000,0
+,0.011609977,207
+,0.023219954,170
+,0.034829931,184
+,0.046439909,166
+,0.058049886,174
+,0.069659863,179
+,0.081269841,162
+,0.092879818,157
+,0.104489795,156
+,0.116099773,182
+,0.127709750,168
+,0.139319727,168
+,0.150929705,155
+,0.162539682,200
+,0.174149659,163
+,0.185759637,178
+,0.197369614,164
+,0.208979591,166
+,0.220589569,137
+,0.232199546,155
+,0.243809523,177
+,0.255419501,145
+,0.267029478,172
+,0.278639455,155
+,0.290249433,201
+,0.301859410,166
+,0.313469387,169
+,0.325079365,158
+,0.336689342,169
+,0.348299319,155
+,0.359909297,187
+,0.371519274,177
+,0.383129251,149
+,0.394739229,196
+,0.406349206,160
+,0.417959183,174
+,0.429569160,165
+,0.441179138,149
+,0.452789115,181
+,0.464399092,180
+,0.476009070,156
+,0.487619047,163
+,0.499229024,188
+,0.510839002,173
+,0.522448979,160
+,0.534058956,168
+,0.545668934,154
+,0.557278911,155
+,0.568888888,161
+,0.580498866,163
+,0.592108843,172
+,0.603718820,168
+,0.615328798,181
+,0.626938775,167
+,0.638548752,172
+,0.650158730,158
+,0.661768707,172
+,0.673378684,167
+,0.684988662,180
+,0.696598639,188
+,0.708208616,160
+,0.719818594,166
+,0.731428571,158
+,0.743038548,176
+,0.754648526,153
+,0.766258503,173
+,0.777868480,449
+,0.789478458,30
+,0.801088435,70
+,0.812698412,181
+,0.824308390,165
+,0.835918367,174
+,0.847528344,181
+,0.859138321,179
+,0.870748299,154
+,0.882358276,169
+,0.893968253,150
+,0.905578231,189
+,0.917188208,159
+,0.928798185,172
+,0.940408163,157
+,0.952018140,167
+,0.963628117,169
+,0.975238095,155
+,0.986848072,189
+,0.998458049,178
+,1.010068027,168
+,1.021678004,169
+,1.033287981,178
+,1.044897959,157
+,1.056507936,166
+,1.068117913,162
+,1.079727891,170
+,1.091337868,186
+,1.102947845,178
+,1.114557823,178
+,1.126167800,155
+,1.137777777,173
+,1.149387755,156
+,1.160997732,158
+,1.172607709,170
+,1.184217687,167
+,1.195827664,160
+,1.207437641,180
+,1.219047619,153
+,1.230657596,154
+,1.242267573,171
+,1.253877551,159
+,1.265487528,194
+,1.277097505,170
+,1.288707482,157
+,1.300317460,184
+,1.311927437,156
+,1.323537414,173
+,1.335147392,184
+,1.346757369,168
+,1.358367346,182
+,1.369977324,147
+,1.381587301,164
+,1.393197278,163
+,1.404807256,165
+,1.416417233,181
+,1.428027210,172
+,1.439637188,169
+,1.451247165,165
+,1.462857142,166
+,1.474467120,158
+,1.486077097,162
+,1.497687074,188
+,1.509297052,176
+,1.520907029,176
+,1.532517006,159
+,1.544126984,183
+,1.555736961,178
+,1.567346938,168
+,1.578956916,171
+,1.590566893,158
+,1.602176870,153
+,1.613786848,189
+,1.625396825,171
+,1.637006802,142
+,1.648616780,503
+,1.660226757,0
+,1.671836734,30
+,1.683446712,189
+,1.695056689,146
+,1.706666666,174
+,1.718276643,171
+,1.729886621,169
+,1.741496598,164
+,1.753106575,181
+,1.764716553,180
+,1.776326530,163
+,1.787936507,174
+,1.799546485,135
+,1.811156462,193
+,1.822766439,187
+,1.834376417,176
+,1.845986394,172
+,1.857596371,155
+,1.869206349,185
+,1.880816326,167
+,1.892426303,173
+,1.904036281,162
+,1.915646258,166
+,1.927256235,167
+,1.938866213,179
+,1.950476190,170
+,1.962086167,158
+,1.973696145,168
+,1.985306122,162
+,1.996916099,182
+,2.008526077,167
+,2.020136054,185
+,2.031746031,165
+,2.043356009,184
+,2.054965986,157
+,2.066575963,167
+,2.078185941,164
+,2.089795918,160
+,2.101405895,181
+,2.113015873,165
+,2.124625850,181
+,2.136235827,161
+,2.147845804,176
+,2.159455782,177
+,2.171065759,150
+,2.182675736,185
+,2.194285714,173
+,2.205895691,162
+,2.217505668,169
+,2.229115646,171
+,2.240725623,140
+,2.252335600,196
+,2.263945578,155
+,2.275555555,171
+,2.287165532,186
+,2.298775510,157
+,2.310385487,166
+,2.321995464,169
+,2.333605442,183
+,2.345215419,186
+,2.356825396,138
+,2.368435374,162
+,2.380045351,180
+,2.391655328,165
+,2.403265306,181
+,2.414875283,444
+,2.426485260,27
+,2.438095238,150
+,2.449705215,166
+,2.461315192,177
+,2.472925170,174
+,2.484535147,165
+,2.496145124,158
+,2.507755102,178
+,2.519365079,177
+,2.530975056,172
+,2.542585034,174
+,2.554195011,168
+,2.565804988,165
+,2.577414965,168
+,2.589024943,149
+,2.600634920,171
+,2.612244897,164
+,2.623854875,163
+,2.635464852,182
+,2.647074829,162
+,2.658684807,156
+,2.670294784,173
+,2.681904761,188
+,2.693514739,166
+,2.705124716,157
+,2.716734693,170
+,2.728344671,167
+,2.739954648,191
+,2.751564625,154
+,2.763174603,175
+,2.774784580,157
+,2.786394557,169
+,2.798004535,160
+,2.809614512,163
+,2.821224489,191
+,2.832834467,158
+,2.844444444,184
+,2.856054421,164
+,2.867664399,176
+,2.879274376,182
+,2.890884353,180
+,2.902494331,138
+,2.914104308,170
+,2.925714285,172
+,2.937324263,172
+,2.948934240,168
+,2.960544217,186
+,2.972154195,171
+,2.983764172,154
+,2.995374149,185
+,3.006984126,172
+,3.018594104,164
+,3.030204081,176
+,3.041814058,195
+,3.053424036,160
+,3.065034013,124
+,3.076643990,181
+,3.088253968,170
+,3.099863945,178
+,3.111473922,165
+,3.123083900,164
+,3.134693877,194
+,3.146303854,157
+,3.157913832,205
+,3.169523809,163
+,3.181133786,159
+,3.192743764,184
+,3.204353741,145
+,3.215963718,170
+,3.227573696,155
+,3.239183673,161
+,3.250793650,164
+,3.262403628,184
+,3.274013605,175
+,3.285623582,155
+,3.297233560,164
+,3.308843537,181
+,3.320453514,182
+,3.332063492,145
+,3.343673469,177
+,3.355283446,162
+,3.366893424,153
+,3.378503401,185
+,3.390113378,174
+,3.401723356,167
+,3.413333333,187
+,3.424943310,157
+,3.436553287,170
+,3.448163265,169
+,3.459773242,166
+,3.471383219,171
+,3.482993197,165
+,3.494603174,158
+,3.506213151,181
+,3.517823129,168
+,3.529433106,175
+,3.541043083,162
+,3.552653061,167
+,3.564263038,179
+,3.575873015,167
+,3.587482993,156
+,3.599092970,209
+,3.610702947,179
+,3.622312925,159
+,3.633922902,180
+,3.645532879,152
+,3.657142857,169
+,3.668752834,189
+,3.680362811,170
+,3.691972789,156
+,3.703582766,165
+,3.715192743,179
+,3.726802721,173
+,3.738412698,163
+,3.750022675,170
+,3.761632653,181
+,3.773242630,177
+,3.784852607,181
+,3.796462585,166
+,3.808072562,153
+,3.819682539,164
+,3.831292517,209
+,3.842902494,159
+,3.854512471,194
+,3.866122448,164
+,3.877732426,184
+,3.889342403,163
+,3.900952380,173
+,3.912562358,165
+,3.924172335,164
+,3.935782312,182
+,3.947392290,170
+,3.959002267,160
+,3.970612244,173
+,3.982222222,160
+,3.993832199,174
+,4.005442176,179
+,4.017052154,179
+,4.028662131,145
+,4.040272108,196
+,4.051882086,155
+,4.063492063,170
+,4.075102040,180
+,4.086712018,156
+,4.098321995,159
+,4.109931972,182
+,4.121541950,175
+,4.133151927,173
+,4.144761904,164
+,4.156371882,186
+,4.167981859,160
+,4.179591836,175
+,4.191201814,178
+,4.202811791,159
+,4.214421768,177
+,4.226031746,181
+,4.237641723,177
+,4.249251700,163
+,4.260861678,158
+,4.272471655,188
+,4.284081632,163
+,4.295691609,158
+,4.307301587,164
+,4.318911564,164
+,4.330521541,183
+,4.342131519,160
+,4.353741496,182
+,4.365351473,172
+,4.376961451,172
+,4.388571428,179
+,4.400181405,154
+,4.411791383,166
+,4.423401360,174
+,4.435011337,156
+,4.446621315,174
+,4.458231292,169
+,4.469841269,169
+,4.481451247,178
+,4.493061224,175
+,4.504671201,193
+,4.516281179,153
+,4.527891156,160
+,4.539501133,176
+,4.551111111,167
+,4.562721088,184
+,4.574331065,163
+,4.585941043,150
+,4.597551020,156
+,4.609160997,182
+,4.620770975,168
+,4.632380952,168
+,4.643990929,152
+,4.655600907,174
+,4.667210884,186
+,4.678820861,168
+,4.690430839,173
+,4.702040816,184
+,4.713650793,169
+,4.725260770,166
+,4.736870748,164
+,4.748480725,193
+,4.760090702,155
+,4.771700680,164
+,4.783310657,181
+,4.794920634,142
+,4.806530612,183
+,4.818140589,181
+,4.829750566,185
+,4.841360544,171
+,4.852970521,184
+,4.864580498,156
+,4.876190476,162
+,4.887800453,182
+,4.899410430,161
+,4.911020408,175
+,4.922630385,168
+,4.934240362,172
+,4.945850340,151
+,4.957460317,176
+,4.969070294,171
+,4.980680272,93
+,4.992290249,0
+,5.003900226,0
+,5.015510204,0
+,5.027120181,0
+,5.038730158,0
+,5.050340136,0
+,5.061950113,0
+,5.073560090,0
+,5.085170068,0
+,5.096780045,0
+,5.108390022,0
+,5.120000000,0
+,5.131609977,0
+,5.143219954,0
+,5.154829931,0
+,5.166439909,0
+,5.178049886,0
+,5.189659863,0
diff -r d40b62a2006f -r c30b9720bde0 tests/test-transforms-basic.sh
--- a/tests/test-transforms-basic.sh	Wed Jun 15 15:39:08 2011 +0100
+++ b/tests/test-transforms-basic.sh	Tue Jun 21 15:41:52 2011 +0100
@@ -28,6 +28,9 @@
     -set-parameters \
     -set-step-and-block-size \
     -set-sample-rate \
+    -df-windowtype-default \
+    -df-windowtype-hanning \
+    -df-windowtype-hamming \
     ; do
 
     for type in xml n3 ; do 
@@ -36,10 +39,10 @@
 	expected=$mypath/expected/transforms-basic-percussiononsets$suffix.csv
 
 	test -f $transform || \
-	    fail "Internal error: no transforms file for suffix $suffix"
+	    fail "Internal error: no transforms file for suffix $suffix (looking for $transform)"
 
 	test -f $expected || \
-	    fail "Internal error: no expected output file for suffix $suffix"
+	    fail "Internal error: no expected output file for suffix $suffix (looking for $expected)"
 
 	$r -t $transform -w csv --csv-stdout $infile > $tmpfile2 2>/dev/null || \
 	    fail "Fails to run transform $transform"
diff -r d40b62a2006f -r c30b9720bde0 tests/transforms/transforms-basic-percussiononsets-df-windowtype-default.n3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/transforms/transforms-basic-percussiononsets-df-windowtype-default.n3	Tue Jun 21 15:41:52 2011 +0100
@@ -0,0 +1,10 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix vamp: <http://purl.org/ontology/vamp/>.
+@prefix examples: <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#>.
+@prefix : <#>.
+
+:transform0 a vamp:Transform;
+	vamp:plugin examples:percussiononsets;
+	vamp:output examples:percussiononsets_output_detectionfunction.
+
+
diff -r d40b62a2006f -r c30b9720bde0 tests/transforms/transforms-basic-percussiononsets-df-windowtype-default.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/transforms/transforms-basic-percussiononsets-df-windowtype-default.xml	Tue Jun 21 15:41:52 2011 +0100
@@ -0,0 +1,12 @@
+<transform
+    id="vamp:vamp-example-plugins:percussiononsets:detectionfunction"
+    pluginVersion="2"
+    program=""
+    stepSize="512"
+    blockSize="1024"
+    startTime="0.000000000"
+    duration="0.000000000"
+    sampleRate="0">
+  <parameter name="sensitivity" value="40"/>
+  <parameter name="threshold" value="3"/>
+</transform>
diff -r d40b62a2006f -r c30b9720bde0 tests/transforms/transforms-basic-percussiononsets-df-windowtype-hamming.n3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/transforms/transforms-basic-percussiononsets-df-windowtype-hamming.n3	Tue Jun 21 15:41:52 2011 +0100
@@ -0,0 +1,11 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix vamp: <http://purl.org/ontology/vamp/>.
+@prefix examples: <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#>.
+@prefix : <#>.
+
+:transform0 a vamp:Transform;
+	vamp:plugin examples:percussiononsets;
+	vamp:window_type "hamming" ;
+	vamp:output examples:percussiononsets_output_detectionfunction.
+
+
diff -r d40b62a2006f -r c30b9720bde0 tests/transforms/transforms-basic-percussiononsets-df-windowtype-hamming.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/transforms/transforms-basic-percussiononsets-df-windowtype-hamming.xml	Tue Jun 21 15:41:52 2011 +0100
@@ -0,0 +1,13 @@
+<transform
+    id="vamp:vamp-example-plugins:percussiononsets:detectionfunction"
+    pluginVersion="2"
+    program=""
+    stepSize="512"
+    blockSize="1024"
+    windowType="hamming"
+    startTime="0.000000000"
+    duration="0.000000000"
+    sampleRate="0">
+  <parameter name="sensitivity" value="40"/>
+  <parameter name="threshold" value="3"/>
+</transform>
diff -r d40b62a2006f -r c30b9720bde0 tests/transforms/transforms-basic-percussiononsets-df-windowtype-hanning.n3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/transforms/transforms-basic-percussiononsets-df-windowtype-hanning.n3	Tue Jun 21 15:41:52 2011 +0100
@@ -0,0 +1,11 @@
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>.
+@prefix vamp: <http://purl.org/ontology/vamp/>.
+@prefix examples: <http://vamp-plugins.org/rdf/plugins/vamp-example-plugins#>.
+@prefix : <#>.
+
+:transform0 a vamp:Transform;
+	vamp:plugin examples:percussiononsets;
+	vamp:window_type "hanning" ;
+	vamp:output examples:percussiononsets_output_detectionfunction.
+
+
diff -r d40b62a2006f -r c30b9720bde0 tests/transforms/transforms-basic-percussiononsets-df-windowtype-hanning.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/transforms/transforms-basic-percussiononsets-df-windowtype-hanning.xml	Tue Jun 21 15:41:52 2011 +0100
@@ -0,0 +1,13 @@
+<transform
+    id="vamp:vamp-example-plugins:percussiononsets:detectionfunction"
+    pluginVersion="2"
+    program=""
+    stepSize="512"
+    blockSize="1024"
+    windowType="hanning"
+    startTime="0.000000000"
+    duration="0.000000000"
+    sampleRate="0">
+  <parameter name="sensitivity" value="40"/>
+  <parameter name="threshold" value="3"/>
+</transform>