--- qsampler/trunk/src/qsamplerMainForm.ui.h	2005/06/17 22:43:56	661
+++ qsampler/trunk/src/qsamplerMainForm.ui.h	2005/06/23 22:54:14	680
@@ -387,9 +387,16 @@
     // For the time being, just pump it to messages.
     if (pCustomEvent->type() == QSAMPLER_CUSTOM_EVENT) {
         qsamplerCustomEvent *pEvent = (qsamplerCustomEvent *) pCustomEvent;
-        appendMessagesColor(tr("Notify event: %1 data: %2")
-            .arg(::lscp_event_to_text(pEvent->event()))
-            .arg(pEvent->data()), "#996699"); 
+		if (pEvent->event() == LSCP_EVENT_CHANNEL_INFO) {
+			int iChannelID = pEvent->data().toInt();
+			qsamplerChannelStrip *pChannelStrip = channelStrip(iChannelID);
+			if (pChannelStrip)
+				channelStripChanged(pChannelStrip);
+		} else {
+			appendMessagesColor(tr("Notify event: %1 data: %2")
+				.arg(::lscp_event_to_text(pEvent->event()))
+				.arg(pEvent->data()), "#996699"); 
+		}
     }
 }
 
@@ -1817,25 +1824,30 @@
         }
     }
 
-	// Refresh each channel usage, on each period...
-	if (m_pClient && (m_changedStrips.count() > 0 || m_pOptions->bAutoRefresh)) {
-		m_iTimerSlot += QSAMPLER_TIMER_MSECS;
-		if (m_iTimerSlot >= m_pOptions->iAutoRefreshTime && m_pWorkspace->isUpdatesEnabled())  {
-			m_iTimerSlot = 0;
-			// Update the channel information for each pending strip...
+	if (m_pClient) {
+		// Update the channel information for each pending strip...
+		if (m_changedStrips.count() > 0) {
 			for (qsamplerChannelStrip *pChannelStrip = m_changedStrips.first();
-					pChannelStrip;
-						pChannelStrip = m_changedStrips.next()) {
+					pChannelStrip; pChannelStrip = m_changedStrips.next()) {
 				// If successfull, remove from pending list...
 				if (pChannelStrip->updateChannelInfo())
 					m_changedStrips.remove(pChannelStrip);
 			}
-			// Update the channel stream usage for each strip...
-			QWidgetList wlist = m_pWorkspace->windowList();
-			for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
-				qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
-				if (pChannelStrip && pChannelStrip->isVisible())
-					pChannelStrip->updateChannelUsage();
+		}
+		// Refresh each channel usage, on each period...
+		if (m_pOptions->bAutoRefresh) {
+			m_iTimerSlot += QSAMPLER_TIMER_MSECS;
+			if (m_iTimerSlot >= m_pOptions->iAutoRefreshTime)  {
+				m_iTimerSlot = 0;
+				// Update the channel stream usage for each strip...
+				QWidgetList wlist = m_pWorkspace->windowList();
+				for (int iChannel = 0;
+						iChannel < (int) wlist.count(); iChannel++) {
+					qsamplerChannelStrip *pChannelStrip
+						= (qsamplerChannelStrip *) wlist.at(iChannel);
+					if (pChannelStrip && pChannelStrip->isVisible())
+						pChannelStrip->updateChannelUsage();
+				}
 			}
 		}
 	}
@@ -2019,6 +2031,10 @@
     ::lscp_client_set_timeout(m_pClient, m_pOptions->iServerTimeout);
     appendMessages(tr("Client receive timeout is set to %1 msec.").arg(::lscp_client_get_timeout(m_pClient)));
 
+	// Subscribe to channel info change notifications...
+	if (::lscp_client_subscribe(m_pClient, LSCP_EVENT_CHANNEL_INFO) != LSCP_OK)
+		appendMessagesClient("lscp_client_subscribe");
+
     // We may stop scheduling around.
     stopSchedule();
 
@@ -2032,7 +2048,7 @@
 	// if visible, that we're ready...
 	if (m_pDeviceForm && m_pDeviceForm->isVisible())
 	    m_pDeviceForm->setClient(m_pClient);
-	    
+
     // Is any session pending to be loaded?
     if (!m_pOptions->sSessionFile.isEmpty()) {
         // Just load the prabably startup session...
@@ -2074,7 +2090,8 @@
     closeSession(false);
 
     // Close us as a client...
-    lscp_client_destroy(m_pClient);
+	::lscp_client_unsubscribe(m_pClient, LSCP_EVENT_CHANNEL_INFO);
+    ::lscp_client_destroy(m_pClient);
     m_pClient = NULL;
 
     // Log final here.