comparison runner/FeatureExtractionManager.cpp @ 139:a4bee1a374b4 midi

Merge from default branch
author Chris Cannam
date Mon, 13 Oct 2014 11:43:24 +0100
parents ee56e3e9eeb5
children 447230267c0d
comparison
equal deleted inserted replaced
137:65a488d8c1bb 139:a4bee1a374b4
143 return PluginInputDomainAdapter::BlackmanWindow; 143 return PluginInputDomainAdapter::BlackmanWindow;
144 case NuttallWindow: 144 case NuttallWindow:
145 return PluginInputDomainAdapter::NuttallWindow; 145 return PluginInputDomainAdapter::NuttallWindow;
146 case BlackmanHarrisWindow: 146 case BlackmanHarrisWindow:
147 return PluginInputDomainAdapter::BlackmanHarrisWindow; 147 return PluginInputDomainAdapter::BlackmanHarrisWindow;
148 case GaussianWindow:
149 case ParzenWindow:
150 // Not supported in Vamp SDK, fall through
148 default: 151 default:
149 cerr << "ERROR: Unknown or unsupported window type \"" << t << "\", using Hann (\"" << HanningWindow << "\")" << endl; 152 cerr << "ERROR: Unknown or unsupported window type \"" << t << "\", using Hann (\"" << HanningWindow << "\")" << endl;
150 return PluginInputDomainAdapter::HanningWindow; 153 return PluginInputDomainAdapter::HanningWindow;
151 } 154 }
152 } 155 }