Merge branch 'master' into zynaddsubfx-master

This commit is contained in:
Tobias Doerffel
2009-10-01 14:12:49 +02:00
5 changed files with 13 additions and 13 deletions

View File

@@ -229,9 +229,11 @@ public:
if( it_inst )
{
isSF2 = true;
it_inst->loadResource(
configManager::inst()->
defaultSoundfont() );
if( configManager::inst()->defaultSoundfont() )
{
it_inst->loadResource(
configManager::inst()->defaultSoundfont() );
}
it_inst->childModel( "bank" )->setValue( 0 );
it_inst->childModel( "patch" )->setValue( 0 );
}

View File

@@ -1069,14 +1069,10 @@ VstIntPtr RemoteVstPlugin::hostCallback( AEffect * _effect, VstInt32 _opcode,
case audioMasterGetSampleRate:
SHOW_CALLBACK( "amc: audioMasterGetSampleRate\n" );
__plugin->pluginDispatch( effSetSampleRate,
0, 0, NULL, (float)__plugin->sampleRate() );
return __plugin->sampleRate();
case audioMasterGetBlockSize:
SHOW_CALLBACK( "amc: audioMasterGetBlockSize\n" );
__plugin->pluginDispatch( effSetBlockSize,
0, __plugin->bufferSize() );
return __plugin->bufferSize();