--- qsampler/trunk/src/qsamplerChannelStrip.ui.h	2004/11/16 15:26:18	295
+++ qsampler/trunk/src/qsamplerChannelStrip.ui.h	2004/11/17 12:40:25	297
@@ -143,20 +143,18 @@
         delete pChannelForm;
     }
 
-    if (bResult) {
-        updateChannelInfo();
+    if (bResult)
         emit channelChanged(this);
-    }
 
     return bResult;
 }
 
 
 // Update whole channel info state.
-void qsamplerChannelStrip::updateChannelInfo (void)
+bool qsamplerChannelStrip::updateChannelInfo (void)
 {
     if (m_pChannel == NULL)
-        return;
+        return false;
         
     // Update strip caption.
     QString sText = m_pChannel->channelName();
@@ -165,7 +163,7 @@
 
     // Check if we're up and connected.
     if (m_pChannel->client() == NULL)
-        return;
+        return false;
 
     // Read actual channel information.
     m_pChannel->updateChannelInfo();
@@ -203,15 +201,15 @@
         MidiPortChannelTextLabel->setText(QString("%1 / %2").arg(m_pChannel->midiPort()).arg(m_pChannel->midiChannel() + 1));
 
     // And update the both GUI volume elements.
-    updateChannelVolume();
+    return updateChannelVolume();
 }
 
 
 // Do the dirty volume change.
-void qsamplerChannelStrip::updateChannelVolume (void)
+bool qsamplerChannelStrip::updateChannelVolume (void)
 {
     if (m_pChannel == NULL)
-        return;
+        return false;
 
     // Convert...
 #ifdef CONFIG_ROUND
@@ -236,16 +234,18 @@
     VolumeSlider->setValue(iVolume);
     VolumeSpinBox->setValue(iVolume);
     m_iDirtyChange--;
+    
+    return true;
 }
 
 
 // Update whole channel usage state.
-void qsamplerChannelStrip::updateChannelUsage (void)
+bool qsamplerChannelStrip::updateChannelUsage (void)
 {
     if (m_pChannel == NULL)
-        return;
+        return false;
     if (m_pChannel->client() == NULL)
-        return;
+        return false;
 
     // Conditionally update whole channel status info.
     if (m_pChannel->instrumentStatus() >= 0 && m_pChannel->instrumentStatus() < 100) {
@@ -256,7 +256,7 @@
     }
     // Leave, if we still have an erroneus or incomplete instrument load.
     if (m_pChannel->instrumentStatus() < 100)
-        return;
+        return false;
 
     // Get current channel voice count.
     int iVoiceCount  = ::lscp_get_channel_voice_count(m_pChannel->client(), m_pChannel->channelID());
@@ -270,6 +270,9 @@
     // Update the GUI elements...
     StreamUsageProgressBar->setProgress(iStreamUsage);
     StreamVoiceCountTextLabel->setText(QString("%1 / %2").arg(iStreamCount).arg(iVoiceCount));
+    
+    // We're clean.
+    return true;
 }