--- linuxsampler/trunk/src/network/lscp.y 2004/08/28 14:55:34 228 +++ linuxsampler/trunk/src/network/lscp.y 2005/02/26 02:01:14 411 @@ -105,6 +105,7 @@ | SET SP set_instruction { $$ = $3; } | SUBSCRIBE SP subscribe_event { $$ = $3; } | UNSUBSCRIBE SP unsubscribe_event { $$ = $3; } + | SELECT SP text { $$ = LSCPSERVER->QueryDatabase($3); } | RESET SP CHANNEL SP sampler_channel { $$ = LSCPSERVER->ResetChannel($5); } | RESET { $$ = LSCPSERVER->ResetSampler(); } | QUIT { LSCPSERVER->AnswerClient("Bye!\r\n"); return LSCP_QUIT; } @@ -201,7 +202,7 @@ | NON_MODAL SP filename SP instrument_index SP sampler_channel { $$ = LSCPSERVER->LoadInstrument($3, $5, $7, true); } ; -load_engine_args : engine_name SP sampler_channel { $$ = LSCPSERVER->LoadEngine($1, $3); } +load_engine_args : engine_name SP sampler_channel { $$ = LSCPSERVER->SetEngineType($1, $3); } ; device_index : number @@ -217,7 +218,7 @@ ; midi_input_channel_index : number - | ALL { $$ = 0; } + | ALL { $$ = 16; } ; midi_input_type_name : string @@ -399,6 +400,9 @@ UNSUBSCRIBE : 'U''N''S''U''B''S''C''R''I''B''E' ; +SELECT : 'S''E''L''E''C''T' + ; + CHANNEL : 'C''H''A''N''N''E''L' ;