comparison transform/TransformFactory.cpp @ 1160:ea636412f9fe 3.0-integration

Merge from the default branch
author Chris Cannam
date Thu, 04 Feb 2016 11:16:05 +0000
parents afed8be79032 205250c5d2a2
children 6877f4200912
comparison
equal deleted inserted replaced
1159:444d133b5ab7 1160:ea636412f9fe
804 804
805 Vamp::PluginBase *plugin = 0; 805 Vamp::PluginBase *plugin = 0;
806 806
807 if (t.getType() == Transform::FeatureExtraction) { 807 if (t.getType() == Transform::FeatureExtraction) {
808 808
809 // cerr << "TransformFactory::instantiateDefaultPluginFor: identifier \""
810 // << identifier << "\" is a feature extraction transform" << endl;
811
809 FeatureExtractionPluginFactory *factory = 812 FeatureExtractionPluginFactory *factory =
810 FeatureExtractionPluginFactory::instanceFor(pluginId); 813 FeatureExtractionPluginFactory::instanceFor(pluginId);
811 814
812 if (factory) { 815 if (factory) {
813 plugin = factory->instantiatePlugin(pluginId, rate); 816 plugin = factory->instantiatePlugin(pluginId, rate);
814 } 817 }
815 818
816 } else { 819 } else if (t.getType() == Transform::RealTimeEffect) {
820
821 // cerr << "TransformFactory::instantiateDefaultPluginFor: identifier \""
822 // << identifier << "\" is a real-time transform" << endl;
817 823
818 RealTimePluginFactory *factory = 824 RealTimePluginFactory *factory =
819 RealTimePluginFactory::instanceFor(pluginId); 825 RealTimePluginFactory::instanceFor(pluginId);
820 826
821 if (factory) { 827 if (factory) {
822 plugin = factory->instantiatePlugin(pluginId, 0, 0, rate, 1024, 1); 828 plugin = factory->instantiatePlugin(pluginId, 0, 0, rate, 1024, 1);
823 } 829 }
830
831 } else {
832 cerr << "TransformFactory: ERROR: transform id \""
833 << identifier << "\" is of unknown type" << endl;
824 } 834 }
825 835
826 return plugin; 836 return plugin;
827 } 837 }
828 838