--- qsampler/trunk/src/qsamplerChannel.cpp	2005/03/15 23:54:14	467
+++ qsampler/trunk/src/qsamplerChannel.cpp	2005/08/17 23:03:26	748
@@ -50,11 +50,11 @@
 //  m_sInstrumentFile   = m_sInstrumentName;
 	m_iInstrumentNr     = -1;
 	m_iInstrumentStatus = -1;
-	m_sMidiDriver       = "Alsa";   // DEPRECATED.
+	m_sMidiDriver       = "ALSA";
 	m_iMidiDevice       = -1;
 	m_iMidiPort         = -1;
 	m_iMidiChannel      = -1;
-	m_sAudioDriver      = "Alsa";   // DEPRECATED.
+	m_sAudioDriver      = "ALSA";
 	m_iAudioDevice      = -1;
 	m_fVolume           = 0.0;
 
@@ -66,8 +66,15 @@
 }
 
 
+// Main application form accessor.
+qsamplerMainForm *qsamplerChannel::mainForm(void) const
+{
+	return m_pMainForm;
+}
+
+
 // The global options settings delegated property.
-qsamplerOptions *qsamplerChannel::options (void)
+qsamplerOptions *qsamplerChannel::options (void) const
 {
 	if (m_pMainForm == NULL)
 		return NULL;
@@ -77,7 +84,7 @@
 
 
 // The client descriptor delegated property.
-lscp_client_t *qsamplerChannel::client (void)
+lscp_client_t *qsamplerChannel::client (void) const
 {
 	if (m_pMainForm == NULL)
 		return NULL;
@@ -124,14 +131,14 @@
 			m_iChannelID = -1;
 		}
 	}
-	
+
 	// Return whether we've removed the channel...
 	return (m_iChannelID < 0);
 }
 
 
 // Channel-ID (aka Sammpler-Channel) accessors.
-int qsamplerChannel::channelID (void)
+int qsamplerChannel::channelID (void) const
 {
 	return m_iChannelID;
 }
@@ -143,14 +150,14 @@
 
 
 // Readable channel name.
-QString qsamplerChannel::channelName (void)
+QString qsamplerChannel::channelName (void) const
 {
 	return (m_iChannelID < 0 ? QObject::tr("New Channel") : QObject::tr("Channel %1").arg(m_iChannelID));
 }
 
 
 // Engine name accessors.
-QString& qsamplerChannel::engineName (void)
+const QString& qsamplerChannel::engineName (void) const
 {
 	return m_sEngineName;
 }
@@ -161,7 +168,7 @@
 		return false;
 	if (m_iInstrumentStatus == 100 && m_sEngineName == sEngineName)
 		return true;
-		
+
 	if (::lscp_load_engine(client(), sEngineName.latin1(), m_iChannelID) != LSCP_OK) {
 		appendMessagesClient("lscp_load_engine");
 		return false;
@@ -174,25 +181,25 @@
 
 
 // Instrument filename accessor.
-QString& qsamplerChannel::instrumentFile (void)
+const QString& qsamplerChannel::instrumentFile (void) const
 {
 	return m_sInstrumentFile;
 }
 
 // Instrument index accessor.
-int qsamplerChannel::instrumentNr (void)
+int qsamplerChannel::instrumentNr (void) const
 {
 	return m_iInstrumentNr;
 }
 
 // Instrument name accessor.
-QString& qsamplerChannel::instrumentName (void)
+const QString& qsamplerChannel::instrumentName (void) const
 {
 	return m_sInstrumentName;
 }
 
 // Instrument status accessor.
-int qsamplerChannel::instrumentStatus (void)
+int qsamplerChannel::instrumentStatus (void) const
 {
 	return m_iInstrumentStatus;
 }
@@ -214,7 +221,7 @@
 
 	appendMessages(QObject::tr("Instrument: \"%1\" (%2).")
 		.arg(sInstrumentFile).arg(iInstrumentNr));
-		
+
 	return setInstrument(sInstrumentFile, iInstrumentNr);
 }
 
@@ -236,7 +243,7 @@
 
 
 // MIDI driver type accessors (DEPRECATED).
-QString& qsamplerChannel::midiDriver (void)
+const QString& qsamplerChannel::midiDriver (void) const
 {
 	return m_sMidiDriver;
 }
@@ -261,7 +268,7 @@
 
 
 // MIDI device accessors.
-int qsamplerChannel::midiDevice (void)
+int qsamplerChannel::midiDevice (void) const
 {
 	return m_iMidiDevice;
 }
@@ -286,7 +293,7 @@
 
 
 // MIDI port number accessor.
-int qsamplerChannel::midiPort (void)
+int qsamplerChannel::midiPort (void) const
 {
 	return m_iMidiPort;
 }
@@ -311,7 +318,7 @@
 
 
 // MIDI channel accessor.
-int qsamplerChannel::midiChannel (void)
+int qsamplerChannel::midiChannel (void) const
 {
 	return m_iMidiChannel;
 }
@@ -336,7 +343,7 @@
 
 
 // Audio device accessor.
-int qsamplerChannel::audioDevice (void)
+int qsamplerChannel::audioDevice (void) const
 {
 	return m_iAudioDevice;
 }
@@ -361,7 +368,7 @@
 
 
 // Audio driver type accessors (DEPRECATED).
-QString& qsamplerChannel::audioDriver (void)
+const QString& qsamplerChannel::audioDriver (void) const
 {
 	return m_sAudioDriver;
 }
@@ -386,7 +393,7 @@
 
 
 // Channel volume accessors.
-float qsamplerChannel::volume (void)
+float qsamplerChannel::volume (void) const
 {
 	return m_fVolume;
 }
@@ -465,8 +472,8 @@
 		m_sInstrumentFile = QString::null;
 		m_sInstrumentName = QString::null;
 	}
-	
-	// FIXME: DEPRECATED...
+
+	// Time for device info grabbing...
 	lscp_device_info_t *pDeviceInfo;
 	const QString sNone = QObject::tr("(none)");
 	// Audio device driver type.
@@ -513,7 +520,7 @@
 	bool bResult = false;
 
 	appendMessages(QObject::tr("setup..."));
-	
+
 	qsamplerChannelForm *pChannelForm = new qsamplerChannelForm(pParent);
 	if (pChannelForm) {
 		pChannelForm->setup(this);
@@ -526,31 +533,32 @@
 
 
 // Redirected messages output methods.
-void qsamplerChannel::appendMessages( const QString& s )
+void qsamplerChannel::appendMessages( const QString& s ) const
 {
 	if (m_pMainForm)
 		m_pMainForm->appendMessages(channelName() + ' ' + s);
 }
 
-void qsamplerChannel::appendMessagesColor( const QString& s, const QString& c )
+void qsamplerChannel::appendMessagesColor( const QString& s,
+	const QString& c ) const
 {
 	if (m_pMainForm)
 		m_pMainForm->appendMessagesColor(channelName() + ' ' + s, c);
 }
 
-void qsamplerChannel::appendMessagesText( const QString& s )
+void qsamplerChannel::appendMessagesText( const QString& s ) const
 {
 	if (m_pMainForm)
 		m_pMainForm->appendMessagesText(channelName() + ' ' + s);
 }
 
-void qsamplerChannel::appendMessagesError( const QString& s )
+void qsamplerChannel::appendMessagesError( const QString& s ) const
 {
 	if (m_pMainForm)
 		m_pMainForm->appendMessagesError(channelName() + "\n\n" + s);
 }
 
-void qsamplerChannel::appendMessagesClient( const QString& s )
+void qsamplerChannel::appendMessagesClient( const QString& s ) const
 {
 	if (m_pMainForm)
 		m_pMainForm->appendMessagesClient(channelName() + ' ' + s);
@@ -594,7 +602,7 @@
 	if (isInstrumentFile(sInstrumentFile)) {
 #ifdef CONFIG_LIBGIG
 		if (bInstrumentNames) {
-			RIFF::File *pRiff = new RIFF::File(sInstrumentFile);
+			RIFF::File *pRiff = new RIFF::File(sInstrumentFile.latin1());
 			gig::File  *pGig  = new gig::File(pRiff);
 			gig::Instrument *pInstrument = pGig->GetFirstInstrument();
 			while (pInstrument) {
@@ -625,7 +633,7 @@
 		sInstrumentName = QFileInfo(sInstrumentFile).fileName();
 #ifdef CONFIG_LIBGIG
 		if (bInstrumentNames) {
-			RIFF::File *pRiff = new RIFF::File(sInstrumentFile);
+			RIFF::File *pRiff = new RIFF::File(sInstrumentFile.latin1());
 			gig::File  *pGig  = new gig::File(pRiff);
 			int iIndex = 0;
 			gig::Instrument *pInstrument = pGig->GetFirstInstrument();
@@ -661,5 +669,9 @@
 	return QObject::tr("(No instrument)");
 }
 
+QString qsamplerChannel::loadingInstrument (void) {
+	return QObject::tr("(Loading instrument...)");
+}
+
 
 // end of qsamplerChannel.cpp