--- qsampler/trunk/src/qsamplerMainForm.ui.h 2004/06/05 11:37:06 109 +++ qsampler/trunk/src/qsamplerMainForm.ui.h 2004/06/07 21:41:43 115 @@ -43,9 +43,6 @@ #include "config.h" -#if !defined(WIN32) -#include -#endif // Timer constant stuff. #define QSAMPLER_TIMER_MSECS 200 @@ -547,13 +544,13 @@ int iChannelID = pChannel->channelID(); ts << "# " << pChannel->caption() << endl; ts << "ADD CHANNEL" << endl; - ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannelID << endl; + ts << "SET CHANNEL AUDIO_OUTPUT_TYPE " << iChannelID << " " << pChannel->audioDriver() << endl; ts << "SET CHANNEL MIDI_INPUT_TYPE " << iChannelID << " " << pChannel->midiDriver() << endl; - ts << "SET CHANNEL MIDI_INPUT_PORT " << iChannelID << " " << pChannel->midiPort() << endl; + // ts << "SET CHANNEL MIDI_INPUT_PORT " << iChannelID << " " << pChannel->midiPort() << endl; ts << "SET CHANNEL MIDI_INPUT_CHANNEL " << iChannelID << " " << pChannel->midiChannel() << endl; - ts << "SET CHANNEL AUDIO_OUTPUT_TYPE " << iChannelID << " " << pChannel->audioDriver() << endl; - ts << "SET CHANNEL VOLUME " << iChannelID << " " << pChannel->volume() << endl; + ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannelID << endl; ts << "LOAD INSTRUMENT " << pChannel->instrumentFile() << " " << pChannel->instrumentNr() << " " << iChannelID << endl; + ts << "SET CHANNEL VOLUME " << iChannelID << " " << pChannel->volume() << endl; ts << endl; // Try to keep it snappy :) QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);