--- qsampler/trunk/src/qsamplerChannel.h	2004/11/19 10:18:59	303
+++ qsampler/trunk/src/qsamplerChannel.h	2005/03/22 12:55:29	484
@@ -1,7 +1,7 @@
 // qsamplerChannel.h
 //
 /****************************************************************************
-   Copyright (C) 2003-2004, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2003-2005, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -40,109 +40,130 @@
 {
 public:
 
-    // Constructor.
-    qsamplerChannel(qsamplerMainForm *pMainForm, int iChannelID = -1);
-    // Default destructor.
-    ~qsamplerChannel();
-
-    // Main application options accessor.
-    qsamplerOptions *options();
-
-    // LSCP client descriptor accessor.
-    lscp_client_t * client();
-
-    // Add/remove sampler channel methods.
-    bool     addChannel();
-    bool     removeChannel();
-
-    // Sampler channel ID accessors.
-    int      channelID();
-    void     setChannelID(int iChannelID);
-    
-    // Readable channel name.
-    QString  channelName();
-
-    // Engine name property.
-    QString& engineName();
-    bool     loadEngine(const QString& sEngineName);
-    
-    // Instrument file and index.
-    QString& instrumentFile();
-    int      instrumentNr();
-    int      instrumentStatus();
-    bool     loadInstrument(const QString& sInstrumentFile, int iInstrumentNr);
-    
-    // MIDI input driver (DEPRECATED).
-    QString& midiDriver();
-    bool     setMidiDriver(const QString& sMidiDriver);
-    
-    // MIDI input device.
-    int      midiDevice();
-    bool     setMidiDevice(int iMidiDevice);
-    
-    // MIDI input port.
-    int      midiPort();
-    bool     setMidiPort(int iMidiPort);
-    
-    // MIDI input channel.
-    int      midiChannel();
-    bool     setMidiChannel(int iMidiChannel);
-    
-    // Audio output driver (DEPRECATED).
-    QString& audioDriver();
-    bool     setAudioDriver(const QString& sAudioDriver);
-
-    // Audio output device.
-    int      audioDevice();
-    bool     setAudioDevice(int iAudioDevice);
-    
-    // Sampler channel volume.
-    float    volume();
-    bool     setVolume(float fVolume);
-
-    // Channel info structure map executive.
-    bool     updateChannelInfo();
-
-    // Reset channel method.
-    bool     resetChannel();
-
-    // Channel setup dialog form.
-    bool     channelSetup(QWidget *pParent);
-
-    // Message logging methods (brainlessly mapped to main form's).
-    void     appendMessages       (const QString & s);
-    void     appendMessagesColor  (const QString & s, const QString & c);
-    void     appendMessagesText   (const QString & s);
-    void     appendMessagesError  (const QString & s);
-    void     appendMessagesClient (const QString & s);
-
-    // Context menu event handler.
-    void contextMenuEvent(QContextMenuEvent *pEvent);
-
-    // Retrieve the available instrument name(s) of an instrument file (.gig).
-    static QString     getInstrumentName (const QString& sInstrumentFile, int iInstrumentNr);
-    static QStringList getInstrumentList (const QString& sInstrumentFile);
+	// Constructor.
+	qsamplerChannel(qsamplerMainForm *pMainForm, int iChannelID = -1);
+	// Default destructor.
+	~qsamplerChannel();
+
+	// Main application form accessor.
+	qsamplerMainForm *mainForm() const;
+	
+	// Main application options accessor.
+	qsamplerOptions *options() const;
+
+	// LSCP client descriptor accessor.
+	lscp_client_t * client() const;
+
+	// Add/remove sampler channel methods.
+	bool     addChannel();
+	bool     removeChannel();
+
+	// Sampler channel ID accessors.
+	int      channelID() const;
+	void     setChannelID(int iChannelID);
+
+	// Readable channel name.
+	QString  channelName() const;
+
+	// Engine name property.
+	const QString& engineName() const;
+	bool     loadEngine(const QString& sEngineName);
+
+	// Instrument file and index.
+	const QString& instrumentFile() const;
+	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.
+	bool     setInstrument(const QString& sInstrumentFile, int iInstrumentNr);
+
+	// MIDI input driver (DEPRECATED).
+	const QString& midiDriver() const;
+	bool     setMidiDriver(const QString& sMidiDriver);
+
+	// MIDI input device.
+	int      midiDevice() const;
+	bool     setMidiDevice(int iMidiDevice);
+
+	// MIDI input port.
+	int      midiPort() const;
+	bool     setMidiPort(int iMidiPort);
+
+	// MIDI input channel.
+	int      midiChannel() const;
+	bool     setMidiChannel(int iMidiChannel);
+
+	// Audio output driver (DEPRECATED).
+	const QString& audioDriver() const;
+	bool     setAudioDriver(const QString& sAudioDriver);
+
+	// Audio output device.
+	int      audioDevice() const;
+	bool     setAudioDevice(int iAudioDevice);
+
+	// Sampler channel volume.
+	float    volume() const;
+	bool     setVolume(float fVolume);
+
+	// Istrument name remapper.
+	void     updateInstrumentName();
+
+	// Channel info structure map executive.
+	bool     updateChannelInfo();
+
+	// Channel setup dialog form.
+	bool     channelSetup(QWidget *pParent);
+
+	// Reset channel method.
+	bool     channelReset();
+
+	// Message logging methods (brainlessly mapped to main form's).
+	void     appendMessages       (const QString & s) const;
+	void     appendMessagesColor  (const QString & s, const QString & c) const;
+	void     appendMessagesText   (const QString & s) const;
+	void     appendMessagesError  (const QString & s) const;
+	void     appendMessagesClient (const QString & s) const;
+
+	// Context menu event handler.
+	void contextMenuEvent(QContextMenuEvent *pEvent);
+
+	// Common (invalid) name-helpers.
+	static QString noEngineName();
+	static QString noInstrumentName();
+
+	// Check whether a given file is an instrument file.
+	static bool isInstrumentFile (const QString& sInstrumentFile);
+
+	// Retrieve the available instrument name(s) of an instrument file (.gig).
+	static QString getInstrumentName (const QString& sInstrumentFile,
+							int iInstrumentNr, bool bInstrumentNames);
+	static QStringList getInstrumentList (const QString& sInstrumentFile,
+							bool bInstrumentNames);
 
 private:
 
-    // Main application form reference.
-    qsamplerMainForm *m_pMainForm;
+	// Main application form reference.
+	qsamplerMainForm *m_pMainForm;
 
-    // Unique channel identifier.
-    int     m_iChannelID;
+	// Unique channel identifier.
+	int     m_iChannelID;
 
-    // Sampler channel info map.
-    QString m_sEngineName;
-    QString m_sInstrumentFile;
-    int     m_iInstrumentNr;
-    int     m_iInstrumentStatus;
-    QString m_sMidiDriver;          // DEPRECATED.
-    int     m_iMidiDevice;
-    int     m_iMidiPort;
-    int     m_iMidiChannel;
-    QString m_sAudioDriver;         // DEPRECATED.
-    int     m_iAudioDevice;
-    float   m_fVolume;
+	// Sampler channel info map.
+	QString m_sEngineName;
+	QString m_sInstrumentName;
+	QString m_sInstrumentFile;
+	int     m_iInstrumentNr;
+	int     m_iInstrumentStatus;
+	QString m_sMidiDriver;          // DEPRECATED.
+	int     m_iMidiDevice;
+	int     m_iMidiPort;
+	int     m_iMidiChannel;
+	QString m_sAudioDriver;         // DEPRECATED.
+	int     m_iAudioDevice;
+	float   m_fVolume;
 };
 
 #endif  // __qsamplerChannel_h