--- qsampler/trunk/src/qsamplerChannel.h 2005/03/22 12:55:29 484 +++ qsampler/trunk/src/qsamplerChannel.h 2005/05/08 17:04:10 519 @@ -47,7 +47,7 @@ // Main application form accessor. qsamplerMainForm *mainForm() const; - + // Main application options accessor. qsamplerOptions *options() const; @@ -74,7 +74,7 @@ int instrumentNr() const; const QString& instrumentName() const; int instrumentStatus() const; - + // Instrument file loader. bool loadInstrument(const QString& sInstrumentFile, int iInstrumentNr); // Special instrument file/name/number settler. @@ -133,6 +133,7 @@ // Common (invalid) name-helpers. static QString noEngineName(); static QString noInstrumentName(); + static QString loadingInstrument(); // Check whether a given file is an instrument file. static bool isInstrumentFile (const QString& sInstrumentFile); @@ -157,11 +158,11 @@ QString m_sInstrumentFile; int m_iInstrumentNr; int m_iInstrumentStatus; - QString m_sMidiDriver; // DEPRECATED. + QString m_sMidiDriver; int m_iMidiDevice; int m_iMidiPort; int m_iMidiChannel; - QString m_sAudioDriver; // DEPRECATED. + QString m_sAudioDriver; int m_iAudioDevice; float m_fVolume; };