/[svn]/qsampler/trunk/src/qsamplerMainForm.ui.h

Diff of /qsampler/trunk/src/qsamplerMainForm.ui.h

Parent Directory | Revision Log | View Patch Patch

-revision 263 by capela,
Wed Sep 29 09:01:35 2004 UTC
+revision 1036 by capela,
Mon Jan 15 19:11:59 2007 UTC
 Line 2
  //
  // ui.h extension file, included from the uic-generated form implementation.
  /****************************************************************************
-    Copyright (C) 2004, rncbc aka Rui Nuno Capela. All rights reserved.
+    Copyright (C) 2004-2007, 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
 Line 14
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU General Public License along
-    along with this program; if not, write to the Free Software
+    with this program; if not, write to the Free Software Foundation, Inc.,
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *****************************************************************************/
 Line 26
  #include <qprocess.h>
  #include <qmessagebox.h>
  #include <qdragobject.h>
+ #include <qregexp.h>
  #include <qfiledialog.h>
  #include <qfileinfo.h>
  #include <qfile.h>
  #include <qtextstream.h>
  #include <qstatusbar.h>
+ #include <qslider.h>
+ #include <qspinbox.h>
  #include <qlabel.h>
  #include <qtimer.h>
+ #include <qtooltip.h>
  #include "qsamplerAbout.h"
  #include "qsamplerOptions.h"
+ #include "qsamplerChannel.h"
  #include "qsamplerMessages.h"
  #include "qsamplerChannelStrip.h"
+ #include "qsamplerInstrumentList.h"
+ #include "qsamplerInstrumentListForm.h"
+ #include "qsamplerDeviceForm.h"
  #include "qsamplerOptionsForm.h"
- #include "config.h"
+ #ifdef HAVE_SIGNAL_H
+ #include <signal.h>
+ #endif
+ #ifdef CONFIG_LIBGIG
+ #include <gig.h>
+ #endif
+ // Needed for lroundf()
+ #include <math.h>
+ #ifndef CONFIG_ROUND
+ static inline long lroundf ( float x )
+ {
+         if (x >= 0.0f)
+                 return long(x + 0.5f);
+         else
+                 return long(x - 0.5f);
+ }
+ #endif
  // Timer constant stuff.
  #define QSAMPLER_TIMER_MSECS    200
-Line 93 
 private:
+Line 120 
 private:
  //-------------------------------------------------------------------------
  // qsamplerMainForm -- Main window form implementation.
+ // Kind of singleton reference.
+ qsamplerMainForm *qsamplerMainForm::g_pMainForm = NULL;
  // Kind of constructor.
  void qsamplerMainForm::init (void)
  {
+         // Pseudo-singleton reference setup.
+         g_pMainForm = this;
      // Initialize some pointer references.
      m_pOptions = NULL;
      // All child forms are to be created later, not earlier than setup.
      m_pMessages = NULL;
+     m_pInstrumentListForm = NULL;
+     m_pDeviceForm = NULL;
      // We'll start clean.
-     m_iUntitled = 0;
+     m_iUntitled   = 0;
      m_iDirtyCount = 0;
      m_pServer = NULL;
-Line 114 
 void qsamplerMainForm::init (void)
+Line 150 
 void qsamplerMainForm::init (void)
      m_iTimerSlot = 0;
+ #ifdef HAVE_SIGNAL_H
+         // Set to ignore any fatal "Broken pipe" signals.
+         ::signal(SIGPIPE, SIG_IGN);
+ #endif
+ #ifdef CONFIG_VOLUME
+     // Make some extras into the toolbar...
+         const QString& sVolumeText = tr("Master volume");
+         m_iVolumeChanging = 0;
+         // Volume slider...
+         channelsToolbar->addSeparator();
+         m_pVolumeSlider = new QSlider(Qt::Horizontal, channelsToolbar);
+         m_pVolumeSlider->setTickmarks(QSlider::Below);
+         m_pVolumeSlider->setTickInterval(10);
+         m_pVolumeSlider->setPageStep(10);
+         m_pVolumeSlider->setRange(0, 100);
+         m_pVolumeSlider->setMaximumHeight(22);
+         m_pVolumeSlider->setMinimumWidth(160);
+         QToolTip::add(m_pVolumeSlider, sVolumeText);
+         QObject::connect(m_pVolumeSlider,
+                 SIGNAL(valueChanged(int)),
+                 SLOT(volumeChanged(int)));
+         channelsToolbar->setHorizontallyStretchable(true);
+         channelsToolbar->setStretchableWidget(m_pVolumeSlider);
+         // Volume spin-box
+         channelsToolbar->addSeparator();
+         m_pVolumeSpinBox = new QSpinBox(channelsToolbar);
+         m_pVolumeSpinBox->setSuffix(" %");
+         m_pVolumeSpinBox->setRange(0, 100);
+         QToolTip::add(m_pVolumeSpinBox, sVolumeText);
+         QObject::connect(m_pVolumeSpinBox,
+                 SIGNAL(valueChanged(int)),
+                 SLOT(volumeChanged(int)));
+ #endif
      // Make it an MDI workspace.
      m_pWorkspace = new QWorkspace(this);
      m_pWorkspace->setScrollBarsEnabled(true);
-     // Set the activation connection.
+         // Set the activation connection.
-     QObject::connect(m_pWorkspace, SIGNAL(windowActivated(QWidget *)), this, SLOT(stabilizeForm()));
+         QObject::connect(m_pWorkspace,
+                 SIGNAL(windowActivated(QWidget *)),
+                 SLOT(stabilizeForm()));
      // Make it shine :-)
      setCentralWidget(m_pWorkspace);
-Line 128 
 void qsamplerMainForm::init (void)
+Line 201 
 void qsamplerMainForm::init (void)
      pLabel = new QLabel(tr("Connected"), this);
      pLabel->setAlignment(Qt::AlignLeft);
      pLabel->setMinimumSize(pLabel->sizeHint());
-     m_status[QSAMPLER_STATUS_CLIENT] = pLabel;
+     m_statusItem[QSAMPLER_STATUS_CLIENT] = pLabel;
      statusBar()->addWidget(pLabel);
      // Server address.
      pLabel = new QLabel(this);
      pLabel->setAlignment(Qt::AlignLeft);
-     m_status[QSAMPLER_STATUS_SERVER] = pLabel;
+     m_statusItem[QSAMPLER_STATUS_SERVER] = pLabel;
      statusBar()->addWidget(pLabel, 1);
      // Channel title.
      pLabel = new QLabel(this);
      pLabel->setAlignment(Qt::AlignLeft);
-     m_status[QSAMPLER_STATUS_CHANNEL] = pLabel;
+     m_statusItem[QSAMPLER_STATUS_CHANNEL] = pLabel;
      statusBar()->addWidget(pLabel, 2);
      // Session modification status.
      pLabel = new QLabel(tr("MOD"), this);
      pLabel->setAlignment(Qt::AlignHCenter);
      pLabel->setMinimumSize(pLabel->sizeHint());
-     m_status[QSAMPLER_STATUS_SESSION] = pLabel;
+     m_statusItem[QSAMPLER_STATUS_SESSION] = pLabel;
      statusBar()->addWidget(pLabel);
      // Create the recent files sub-menu.
-Line 163 
 void qsamplerMainForm::destroy (void)
+Line 236 
 void qsamplerMainForm::destroy (void)
  {
      // Do final processing anyway.
      processServerExit();
-     // Delete recentfiles menu.
+ #if defined(WIN32)
-     if (m_pRecentFilesMenu)
+     WSACleanup();
-         delete m_pRecentFilesMenu;
+ #endif
-     // Delete status item labels one by one.
-     if (m_status[QSAMPLER_STATUS_CLIENT])
-         delete m_status[QSAMPLER_STATUS_CLIENT];
-     if (m_status[QSAMPLER_STATUS_SERVER])
-         delete m_status[QSAMPLER_STATUS_SERVER];
-     if (m_status[QSAMPLER_STATUS_CHANNEL])
-         delete m_status[QSAMPLER_STATUS_CHANNEL];
-     if (m_status[QSAMPLER_STATUS_SESSION])
-         delete m_status[QSAMPLER_STATUS_SESSION];
      // Finally drop any widgets around...
+     if (m_pDeviceForm)
+         delete m_pDeviceForm;
+     if (m_pInstrumentListForm)
+         delete m_pInstrumentListForm;
      if (m_pMessages)
          delete m_pMessages;
      if (m_pWorkspace)
          delete m_pWorkspace;
- #if defined(WIN32)
+     // Delete status item labels one by one.
-     WSACleanup();
+     if (m_statusItem[QSAMPLER_STATUS_CLIENT])
+         delete m_statusItem[QSAMPLER_STATUS_CLIENT];
+     if (m_statusItem[QSAMPLER_STATUS_SERVER])
+         delete m_statusItem[QSAMPLER_STATUS_SERVER];
+     if (m_statusItem[QSAMPLER_STATUS_CHANNEL])
+         delete m_statusItem[QSAMPLER_STATUS_CHANNEL];
+     if (m_statusItem[QSAMPLER_STATUS_SESSION])
+         delete m_statusItem[QSAMPLER_STATUS_SESSION];
+ #ifdef CONFIG_VOLUME
+         delete m_pVolumeSpinBox;
+         delete m_pVolumeSlider;
  #endif
+     // Delete recentfiles menu.
+     if (m_pRecentFilesMenu)
+         delete m_pRecentFilesMenu;
+         // Pseudo-singleton reference shut-down.
+         g_pMainForm = NULL;
  }
-Line 195 
 void qsamplerMainForm::setup ( qsamplerO
+Line 281 
 void qsamplerMainForm::setup ( qsamplerO
      // We got options?
      m_pOptions = pOptions;
+     // What style do we create these forms?
+         Qt::WFlags wflags = Qt::WStyle_Customize
+                 | Qt::WStyle_NormalBorder
+                 | Qt::WStyle_Title
+                 | Qt::WStyle_SysMenu
+                 | Qt::WStyle_MinMax
+                 | Qt::WType_TopLevel;
+     if (m_pOptions->bKeepOnTop)
+         wflags |= Qt::WStyle_Tool;
      // Some child forms are to be created right now.
      m_pMessages = new qsamplerMessages(this);
+     m_pDeviceForm = new qsamplerDeviceForm(this, 0, wflags);
+ #ifdef CONFIG_MIDI_INSTRUMENT
+     m_pInstrumentListForm = new qsamplerInstrumentListForm(this, 0, wflags);
+         QObject::connect(m_pInstrumentListForm->InstrumentList,
+                 SIGNAL(instrumentsChanged()),
+                 SLOT(sessionDirty()));
+ #else
+         viewInstrumentsAction->setEnabled(false);
+ #endif
      // Set message defaults...
      updateMessagesFont();
      updateMessagesLimit();
      updateMessagesCapture();
      // Set the visibility signal.
-     QObject::connect(m_pMessages, SIGNAL(visibilityChanged(bool)), this, SLOT(stabilizeForm()));
+         QObject::connect(m_pMessages,
+                 SIGNAL(visibilityChanged(bool)),
+                 SLOT(stabilizeForm()));
      // Initial decorations toggle state.
      viewMenubarAction->setOn(m_pOptions->bMenubar);
-Line 225 
 void qsamplerMainForm::setup ( qsamplerO
+Line 331 
 void qsamplerMainForm::setup ( qsamplerO
          QTextIStream istr(&sDockables);
          istr >> *this;
      }
-     // Try to restore old window positioning.
+     // Try to restore old window positioning and initial visibility.
      m_pOptions->loadWidgetGeometry(this);
+     m_pOptions->loadWidgetGeometry(m_pInstrumentListForm);
+     m_pOptions->loadWidgetGeometry(m_pDeviceForm);
      // Final startup stabilization...
+     updateMaxVolume();
      updateRecentFilesMenu();
      stabilizeForm();
-Line 264 
 bool qsamplerMainForm::queryClose (void)
+Line 373 
 bool qsamplerMainForm::queryClose (void)
              QTextOStream ostr(&sDockables);
              ostr << *this;
              m_pOptions->settings().writeEntry("/Layout/DockWindows", sDockables);
-             // And the main windows state.
+             // And the children, and the main windows state,.
-             m_pOptions->saveWidgetGeometry(this);
+                         m_pOptions->saveWidgetGeometry(m_pDeviceForm);
+                         m_pOptions->saveWidgetGeometry(m_pInstrumentListForm);
+                         m_pOptions->saveWidgetGeometry(this);
+                         // Close popup widgets.
+                         if (m_pInstrumentListForm)
+                                 m_pInstrumentListForm->close();
+                         if (m_pDeviceForm)
+                                 m_pDeviceForm->close();
              // Stop client and/or server, gracefully.
              stopServer();
          }
-Line 284 
 void qsamplerMainForm::closeEvent ( QClo
+Line 400 
 void qsamplerMainForm::closeEvent ( QClo
  }
- // Window drag-n-drop event handlers.
+ // Drag'n'drop file handler.
- void qsamplerMainForm::dragEnterEvent ( QDragEnterEvent* pDragEnterEvent )
+ bool qsamplerMainForm::decodeDragFiles ( const QMimeSource *pEvent, QStringList& files )
  {
-     bool bAccept = false;
+     bool bDecode = false;
-     if (QTextDrag::canDecode(pDragEnterEvent)) {
+     if (QTextDrag::canDecode(pEvent)) {
-         QString sUrl;
+         QString sText;
-         if (QTextDrag::decode(pDragEnterEvent, sUrl) && m_pClient)
+         bDecode = QTextDrag::decode(pEvent, sText);
-             bAccept = QFileInfo(QUrl(sUrl).path()).exists();
+         if (bDecode) {
+             files = QStringList::split('\n', sText);
+             for (QStringList::Iterator iter = files.begin(); iter != files.end(); iter++)
+                 *iter = QUrl((*iter).stripWhiteSpace().replace(QRegExp("^file:"), QString::null)).path();
+         }
      }
-     pDragEnterEvent->accept(bAccept);
+     return bDecode;
+ }
+ // Window drag-n-drop event handlers.
+ void qsamplerMainForm::dragEnterEvent ( QDragEnterEvent* pDragEnterEvent )
+ {
+         QStringList files;
+         pDragEnterEvent->accept(decodeDragFiles(pDragEnterEvent, files));
  }
  void qsamplerMainForm::dropEvent ( QDropEvent* pDropEvent )
  {
-     if (QTextDrag::canDecode(pDropEvent)) {
+     QStringList files;
-         QString sUrl;
-         if (QTextDrag::decode(pDropEvent, sUrl) && closeSession(true))
+     if (!decodeDragFiles(pDropEvent, files))
-             loadSessionFile(QUrl(sUrl).path());
+         return;
-     }
+         for (QStringList::Iterator iter = files.begin(); iter != files.end(); iter++) {
+                 const QString& sPath = *iter;
+                 if (qsamplerChannel::isInstrumentFile(sPath)) {
+                         // Try to create a new channel from instrument file...
+                         qsamplerChannel *pChannel = new qsamplerChannel();
+                         if (pChannel == NULL)
+                                 return;
+                         // Start setting the instrument filename...
+                         pChannel->setInstrument(sPath, 0);
+                         // Before we show it up, may be we'll
+                         // better ask for some initial values?
+                         if (!pChannel->channelSetup(this)) {
+                                 delete pChannel;
+                                 return;
+                         }
+                         // Finally, give it to a new channel strip...
+                         if (!createChannelStrip(pChannel)) {
+                                 delete pChannel;
+                                 return;
+                         }
+                         // Make that an overall update.
+                         m_iDirtyCount++;
+                         stabilizeForm();
+                 }   // Otherwise, load an usual session file (LSCP script)...
+                 else if (closeSession(true)) {
+                         loadSessionFile(sPath);
+                         break;
+                 }
+                 // Make it look responsive...:)
+                 QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
+         }
  }
-Line 315 
 void qsamplerMainForm::customEvent ( QCu
+Line 474 
 void qsamplerMainForm::customEvent ( QCu
      // 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")
+                 if (pEvent->event() == LSCP_EVENT_CHANNEL_INFO) {
-             .arg(::lscp_event_to_text(pEvent->event()))
+                         int iChannelID = pEvent->data().toInt();
-             .arg(pEvent->data()), "#996699");
+                         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");
+                 }
      }
  }
-Line 326 
 void qsamplerMainForm::customEvent ( QCu
+Line 492 
 void qsamplerMainForm::customEvent ( QCu
  void qsamplerMainForm::contextMenuEvent( QContextMenuEvent *pEvent )
  {
      stabilizeForm();
      editMenu->exec(pEvent->globalPos());
  }
-Line 340 
 qsamplerOptions *qsamplerMainForm::optio
+Line 506 
 qsamplerOptions *qsamplerMainForm::optio
      return m_pOptions;
  }
  // The LSCP client descriptor property.
  lscp_client_t *qsamplerMainForm::client (void)
  {
-Line 347 
 lscp_client_t *qsamplerMainForm::client
+Line 514 
 lscp_client_t *qsamplerMainForm::client
  }
+ // The pseudo-singleton instance accessor.
+ qsamplerMainForm *qsamplerMainForm::getInstance (void)
+ {
+         return g_pMainForm;
+ }
  //-------------------------------------------------------------------------
  // qsamplerMainForm -- Session file stuff.
-Line 370 
 bool qsamplerMainForm::newSession (void)
+Line 544 
 bool qsamplerMainForm::newSession (void)
      if (!closeSession(true))
          return false;
+         // Give us what the server has, right now...
+         updateSession();
      // Ok increment untitled count.
      m_iUntitled++;
-Line 391 
 bool qsamplerMainForm::openSession (void
+Line 568 
 bool qsamplerMainForm::openSession (void
      // Ask for the filename to open...
      QString sFilename = QFileDialog::getOpenFileName(
-             m_pOptions->sSessionDir,                // Start here.
+                 m_pOptions->sSessionDir,                // Start here.
-             tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
+                 tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
-             this, 0,                                // Parent and name (none)
+                 this, 0,                                // Parent and name (none)
-             tr("Open Session")                      // Caption.
+                 QSAMPLER_TITLE ": " + tr("Open Session")        // Caption.
      );
      // Have we cancelled?
-Line 425 
 bool qsamplerMainForm::saveSession ( boo
+Line 602 
 bool qsamplerMainForm::saveSession ( boo
              sFilename = m_pOptions->sSessionDir;
          // Prompt the guy...
          sFilename = QFileDialog::getSaveFileName(
-                 sFilename,                              // Start here.
+                         sFilename,                              // Start here.
-                 tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
+                         tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
-                 this, 0,                                // Parent and name (none)
+                         this, 0,                                // Parent and name (none)
-                 tr("Save Session")                      // Caption.
+                         QSAMPLER_TITLE ": " + tr("Save Session")        // Caption.
          );
          // Have we cancelled it?
          if (sFilename.isEmpty())
-Line 438 
 bool qsamplerMainForm::saveSession ( boo
+Line 615 
 bool qsamplerMainForm::saveSession ( boo
              sFilename += ".lscp";
          // Check if already exists...
          if (sFilename != m_sFilename && QFileInfo(sFilename).exists()) {
-             if (QMessageBox::warning(this, tr("Warning"),
+             if (QMessageBox::warning(this,
+                                 QSAMPLER_TITLE ": " + tr("Warning"),
                  tr("The file already exists:\n\n"
                     "\"%1\"\n\n"
                     "Do you want to replace it?")
-Line 460 
 bool qsamplerMainForm::closeSession ( bo
+Line 638 
 bool qsamplerMainForm::closeSession ( bo
      // Are we dirty enough to prompt it?
      if (m_iDirtyCount > 0) {
-         switch (QMessageBox::warning(this, tr("Warning"),
+         switch (QMessageBox::warning(this,
+                         QSAMPLER_TITLE ": " + tr("Warning"),
              tr("The current session has been changed:\n\n"
              "\"%1\"\n\n"
              "Do you want to save the changes?")
-Line 483 
 bool qsamplerMainForm::closeSession ( bo
+Line 662 
 bool qsamplerMainForm::closeSession ( bo
          m_pWorkspace->setUpdatesEnabled(false);
          QWidgetList wlist = m_pWorkspace->windowList();
          for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
-             qsamplerChannelStrip *pChannel = (qsamplerChannelStrip *) wlist.at(iChannel);
+             qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
-             if (bForce && ::lscp_remove_channel(m_pClient, pChannel->channelID()) != LSCP_OK)
+             if (pChannelStrip) {
-                 appendMessagesClient("lscp_remove_channel");
+                 qsamplerChannel *pChannel = pChannelStrip->channel();
-             delete pChannel;
+                 if (bForce && pChannel)
+                     pChannel->removeChannel();
+                 delete pChannelStrip;
+             }
          }
          m_pWorkspace->setUpdatesEnabled(true);
          // We're now clean, for sure.
-Line 510 
 bool qsamplerMainForm::loadSessionFile (
+Line 692 
 bool qsamplerMainForm::loadSessionFile (
          return false;
      }
+         // Tell the world we'll take some time...
+         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
      // Read the file.
+         int iLine = 0;
      int iErrors = 0;
      QTextStream ts(&file);
      while (!ts.atEnd()) {
          // Read the line.
-         QString sCommand = ts.readLine().simplifyWhiteSpace();
+         QString sCommand = ts.readLine().stripWhiteSpace();
+                 iLine++;
          // If not empty, nor a comment, call the server...
          if (!sCommand.isEmpty() && sCommand[0] != '#') {
-             appendMessagesColor(sCommand, "#996633");
+                         // Remember that, no matter what,
-             // Remember that, no matter what,
+                         // all LSCP commands are CR/LF terminated.
-             // all LSCP commands are CR/LF terminated.
+                         sCommand += "\r\n";
-             sCommand += "\r\n";
+                         if (::lscp_client_query(m_pClient, sCommand.latin1()) != LSCP_OK) {
-             if (::lscp_client_query(m_pClient, sCommand.latin1()) != LSCP_OK) {
+                                 appendMessagesColor(QString("%1(%2): %3")
-                 appendMessagesClient("lscp_client_query");
+                                         .arg(QFileInfo(sFilename).fileName()).arg(iLine)
-                 iErrors++;
+                                         .arg(sCommand.simplifyWhiteSpace()), "#996633");
-             }
+                                 appendMessagesClient("lscp_client_query");
+                                 iErrors++;
+                         }
          }
          // Try to make it snappy :)
          QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
-Line 534 
 bool qsamplerMainForm::loadSessionFile (
+Line 723 
 bool qsamplerMainForm::loadSessionFile (
      // Ok. we've read it.
      file.close();
-     // Have we any errors?
+         // Now we'll try to create (update) the whole GUI session.
-     if (iErrors > 0)
+         updateSession();
-         appendMessagesError(tr("Some setttings could not be loaded\nfrom \"%1\" session file.\n\nSorry.").arg(sFilename));
-     // Now we'll try to create the whole GUI session.
+         // We're fornerly done.
-     int iChannels = ::lscp_get_channels(m_pClient);
+         QApplication::restoreOverrideCursor();
-     if (iChannels < 0) {
-         appendMessagesClient("lscp_get_channels");
+         // Have we any errors?
-         appendMessagesError(tr("Could not get current number of channels.\n\nSorry."));
+         if (iErrors > 0)
-     }
+                 appendMessagesError(tr("Session loaded with errors\nfrom \"%1\".\n\nSorry.").arg(sFilename));
-     // Try to (re)create each channel.
-     m_pWorkspace->setUpdatesEnabled(false);
-     for (int iChannelID = 0; iChannelID < iChannels; iChannelID++) {
-         createChannel(iChannelID, false);
-         QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
-     }
-     m_pWorkspace->setUpdatesEnabled(true);
      // Save as default session directory.
      if (m_pOptions)
          m_pOptions->sSessionDir = QFileInfo(sFilename).dirPath(true);
-     // We're not dirty anymore.
+         // We're not dirty anymore, if loaded without errors,
-     m_iDirtyCount = 0;
+         m_iDirtyCount = iErrors;
      // Stabilize form...
      m_sFilename = sFilename;
      updateRecentFiles(sFilename);
      appendMessages(tr("Open session: \"%1\".").arg(sessionName(m_sFilename)));
+     // Make that an overall update.
      stabilizeForm();
      return true;
  }
-Line 570 
 bool qsamplerMainForm::loadSessionFile (
+Line 752 
 bool qsamplerMainForm::loadSessionFile (
  // Save current session to specific file path.
  bool qsamplerMainForm::saveSessionFile ( const QString& sFilename )
  {
+         if (m_pClient == NULL)
+                 return false;
+         // Check whether server is apparently OK...
+         if (::lscp_get_channels(m_pClient) < 0) {
+                 appendMessagesClient("lscp_get_channels");
+                 return false;
+         }
      // Open and write into real file.
      QFile file(sFilename);
      if (!file.open(IO_WriteOnly | IO_Truncate)) {
-Line 577 
 bool qsamplerMainForm::saveSessionFile (
+Line 768 
 bool qsamplerMainForm::saveSessionFile (
          return false;
      }
+         // Tell the world we'll take some time...
+         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
      // Write the file.
-     int iErrors = 0;
+     int  iErrors = 0;
      QTextStream ts(&file);
      ts << "# " << QSAMPLER_TITLE " - " << tr(QSAMPLER_SUBTITLE) << endl;
      ts << "# " << tr("Version")
-Line 589 
 bool qsamplerMainForm::saveSessionFile (
+Line 783 
 bool qsamplerMainForm::saveSessionFile (
      ts << "# " << tr("File")
         << ": " << QFileInfo(sFilename).fileName() << endl;
      ts << "# " << tr("Date")
-        << ": " << QDate::currentDate().toString("MMMM dd yyyy")
+        << ": " << QDate::currentDate().toString("MMM dd yyyy")
         << " "  << QTime::currentTime().toString("hh:mm:ss") << endl;
      ts << "#"  << endl;
      ts << endl;
+         // It is assumed that this new kind of device+session file
+         // will be loaded from a complete initialized server...
+         int *piDeviceIDs;
+         int  iDevice;
+         ts << "RESET" << endl;
+         // Audio device mapping.
+         QMap<int, int> audioDeviceMap;
+         piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Audio);
+         for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
+                 ts << endl;
+                 qsamplerDevice device(qsamplerDevice::Audio, piDeviceIDs[iDevice]);
+                 // Audio device specification...
+                 ts << "# " << device.deviceTypeName() << " " << device.driverName()
+                         << " " << tr("Device") << " " << iDevice << endl;
+                 ts << "CREATE AUDIO_OUTPUT_DEVICE " << device.driverName();
+                 qsamplerDeviceParamMap::ConstIterator deviceParam;
+                 for (deviceParam = device.params().begin();
+                                 deviceParam != device.params().end();
+                                         ++deviceParam) {
+                         const qsamplerDeviceParam& param = deviceParam.data();
+                         if (param.value.isEmpty()) ts << "# ";
+                         ts << " " << deviceParam.key() << "='" << param.value << "'";
+                 }
+                 ts << endl;
+                 // Audio channel parameters...
+                 int iPort = 0;
+                 for (qsamplerDevicePort *pPort = device.ports().first();
+                                 pPort;
+                                         pPort = device.ports().next(), ++iPort) {
+                         qsamplerDeviceParamMap::ConstIterator portParam;
+                         for (portParam = pPort->params().begin();
+                                         portParam != pPort->params().end();
+                                                 ++portParam) {
+                                 const qsamplerDeviceParam& param = portParam.data();
+                                 if (param.fix || param.value.isEmpty()) ts << "# ";
+                                 ts << "SET AUDIO_OUTPUT_CHANNEL_PARAMETER " << iDevice
+                                         << " " << iPort << " " << portParam.key()
+                                         << "='" << param.value << "'" << endl;
+                         }
+                 }
+                 // Audio device index/id mapping.
+                 audioDeviceMap[device.deviceID()] = iDevice;
+                 // Try to keep it snappy :)
+                 QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
+         }
+         // MIDI device mapping.
+         QMap<int, int> midiDeviceMap;
+         piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Midi);
+         for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
+                 ts << endl;
+                 qsamplerDevice device(qsamplerDevice::Midi, piDeviceIDs[iDevice]);
+                 // MIDI device specification...
+                 ts << "# " << device.deviceTypeName() << " " << device.driverName()
+                         << " " << tr("Device") << " " << iDevice << endl;
+                 ts << "CREATE MIDI_INPUT_DEVICE " << device.driverName();
+                 qsamplerDeviceParamMap::ConstIterator deviceParam;
+                 for (deviceParam = device.params().begin();
+                                 deviceParam != device.params().end();
+                                         ++deviceParam) {
+                         const qsamplerDeviceParam& param = deviceParam.data();
+                         if (param.value.isEmpty()) ts << "# ";
+                         ts << " " << deviceParam.key() << "='" << param.value << "'";
+                 }
+                 ts << endl;
+                 // MIDI port parameters...
+                 int iPort = 0;
+                 for (qsamplerDevicePort *pPort = device.ports().first();
+                                 pPort;
+                                         pPort = device.ports().next(), ++iPort) {
+                         qsamplerDeviceParamMap::ConstIterator portParam;
+                         for (portParam = pPort->params().begin();
+                                         portParam != pPort->params().end();
+                                                 ++portParam) {
+                                 const qsamplerDeviceParam& param = portParam.data();
+                                 if (param.fix || param.value.isEmpty()) ts << "# ";
+                                 ts << "SET MIDI_INPUT_PORT_PARAMETER " << iDevice
+                                    << " " << iPort << " " << portParam.key()
+                                    << "='" << param.value << "'" << endl;
+                         }
+                 }
+                 // MIDI device index/id mapping.
+                 midiDeviceMap[device.deviceID()] = iDevice;
+                 // Try to keep it snappy :)
+                 QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
+         }
+         ts << endl;
+ #ifdef CONFIG_MIDI_INSTRUMENT
+         // MIDI instrument mapping...
+         QMap<int, int> midiInstrumentMap;
+         int *piMaps = ::lscp_list_midi_instrument_maps(m_pClient);
+         for (int iMap = 0; piMaps && piMaps[iMap] >= 0; iMap++) {
+                 int iMidiMap = piMaps[iMap];
+                 const char *pszMapName
+                         = ::lscp_get_midi_instrument_map_name(m_pClient, iMidiMap);
+                 ts << "# " << tr("MIDI instrument map") << " " << iMap;
+                 if (pszMapName)
+                         ts << " - " << pszMapName;
+                 ts << endl;
+                 ts << "ADD MIDI_INSTRUMENT_MAP";
+                 if (pszMapName)
+                         ts << " '" << pszMapName << "'";
+                 ts << endl;
+                 // MIDI instrument mapping...
+                 lscp_midi_instrument_t *pInstrs
+                         = ::lscp_list_midi_instruments(m_pClient, iMidiMap);
+                 for (int iInstr = 0; pInstrs && pInstrs[iInstr].map >= 0; iInstr++) {
+                         lscp_midi_instrument_info_t *pInstrInfo
+                                 = ::lscp_get_midi_instrument_info(m_pClient, &pInstrs[iInstr]);
+                         if (pInstrInfo) {
+                                 ts << "MAP MIDI_INSTRUMENT "
+                                         << iMap                        << " "
+                                         << pInstrs[iInstr].bank        << " "
+                                         << pInstrs[iInstr].prog        << " "
+                                         << pInstrInfo->engine_name     << " '"
+                                         << pInstrInfo->instrument_file << "' "
+                                         << pInstrInfo->instrument_nr   << " "
+                                         << pInstrInfo->volume          << " ";
+                                 switch (pInstrInfo->load_mode) {
+                                         case LSCP_LOAD_PERSISTENT:
+                                                 ts << "PERSISTENT";
+                                                 break;
+                                         case LSCP_LOAD_ON_DEMAND_HOLD:
+                                                 ts << "ON_DEMAND_HOLD";
+                                                 break;
+                                         case LSCP_LOAD_ON_DEMAND:
+                                         case LSCP_LOAD_DEFAULT:
+                                         default:
+                                                 ts << "ON_DEMAND";
+                                                 break;
+                                 }
+                                 if (pInstrInfo->name)
+                                         ts << " '" << pInstrInfo->name << "'";
+                                 ts << endl;
+                         }       // Check for errors...
+                         else if (::lscp_client_get_errno(m_pClient)) {
+                                 appendMessagesClient("lscp_get_midi_instrument_info");
+                                 iErrors++;
+                         }
+                         // Try to keep it snappy :)
+                         QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
+                 }
+                 ts << endl;
+                 // Check for errors...
+                 if (pInstrs == NULL && ::lscp_client_get_errno(m_pClient)) {
+                         appendMessagesClient("lscp_list_midi_instruments");
+                         iErrors++;
+                 }
+                 // MIDI strument index/id mapping.
+                 midiInstrumentMap[iMidiMap] = iMap;
+         }
+         // Check for errors...
+         if (piMaps == NULL && ::lscp_client_get_errno(m_pClient)) {
+                 appendMessagesClient("lscp_list_midi_instrument_maps");
+                 iErrors++;
+         }
+ #endif  // CONFIG_MIDI_INSTRUMENT
+         // Sampler channel mapping.
      QWidgetList wlist = m_pWorkspace->windowList();
      for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
-         qsamplerChannelStrip *pChannel = (qsamplerChannelStrip *) wlist.at(iChannel);
+         qsamplerChannelStrip *pChannelStrip
-         int iChannelID = pChannel->channelID();
+                         = static_cast<qsamplerChannelStrip *> (wlist.at(iChannel));
-         ts << "# " << pChannel->caption() << endl;
+         if (pChannelStrip) {
-         ts << "ADD CHANNEL" << endl;
+             qsamplerChannel *pChannel = pChannelStrip->channel();
-         ts << "SET CHANNEL AUDIO_OUTPUT_TYPE " << iChannelID << " " << pChannel->audioDriver() << endl;
+             if (pChannel) {
-         ts << "SET CHANNEL MIDI_INPUT_TYPE " << iChannelID << " " << pChannel->midiDriver() << endl;
+                 ts << "# " << tr("Channel") << " " << iChannel << endl;
-         ts << "SET CHANNEL MIDI_INPUT_PORT " << iChannelID << " " << pChannel->midiPort() << endl;
+                 ts << "ADD CHANNEL" << endl;
-         ts << "SET CHANNEL MIDI_INPUT_CHANNEL " << iChannelID << " ";
+                                 if (audioDeviceMap.isEmpty()) {
-         if (pChannel->midiChannel() > 0)
+                                         ts << "SET CHANNEL AUDIO_OUTPUT_TYPE " << iChannel
-             ts << pChannel->midiChannel();
+                                                 << " " << pChannel->audioDriver() << endl;
-          else
+                                 } else {
-             ts << "ALL";
+                                         ts << "SET CHANNEL AUDIO_OUTPUT_DEVICE " << iChannel
-         ts << endl;
+                                                 << " " << audioDeviceMap[pChannel->audioDevice()] << endl;
-         ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannelID << endl;
+                                 }
-         ts << "LOAD INSTRUMENT NON_MODAL '" << pChannel->instrumentFile() << "' " << pChannel->instrumentNr() << " " << iChannelID << endl;
+                                 if (midiDeviceMap.isEmpty()) {
-         ts << "SET CHANNEL VOLUME " << iChannelID << " " << pChannel->volume() << endl;
+                                         ts << "SET CHANNEL MIDI_INPUT_TYPE " << iChannel
-         ts << endl;
+                                                 << " " << pChannel->midiDriver() << endl;
+                                 } else {
+                                         ts << "SET CHANNEL MIDI_INPUT_DEVICE " << iChannel
+                                                 << " " << midiDeviceMap[pChannel->midiDevice()] << endl;
+                                 }
+                                 ts << "SET CHANNEL MIDI_INPUT_PORT " << iChannel
+                                         << " " << pChannel->midiPort() << endl;
+                 ts << "SET CHANNEL MIDI_INPUT_CHANNEL " << iChannel << " ";
+                 if (pChannel->midiChannel() == LSCP_MIDI_CHANNEL_ALL)
+                     ts << "ALL";
+                 else
+                     ts << pChannel->midiChannel();
+                 ts << endl;
+                 ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannel << endl;
+                                 if (pChannel->instrumentStatus() < 100) ts << "# ";
+                                 ts << "LOAD INSTRUMENT NON_MODAL '" << pChannel->instrumentFile() << "' "
+                                         << pChannel->instrumentNr() << " " << iChannel << endl;
+                                 qsamplerChannelRoutingMap::ConstIterator audioRoute;
+                                 for (audioRoute = pChannel->audioRouting().begin();
+                                                 audioRoute != pChannel->audioRouting().end();
+                                                         ++audioRoute) {
+                                         ts << "SET CHANNEL AUDIO_OUTPUT_CHANNEL " << iChannel
+                                                 << " " << audioRoute.key()
+                                                 << " " << audioRoute.data() << endl;
+                                 }
+                                 ts << "SET CHANNEL VOLUME " << iChannel
+                                         << " " << pChannel->volume() << endl;
+                                 if (pChannel->channelMute())
+                                         ts << "SET CHANNEL MUTE " << iChannel << " 1" << endl;
+                                 if (pChannel->channelSolo())
+                                         ts << "SET CHANNEL SOLO " << iChannel << " 1" << endl;
+ #ifdef CONFIG_MIDI_INSTRUMENT
+                                 if (pChannel->midiMap() >= 0) {
+                                         ts << "SET CHANNEL MIDI_INSTRUMENT_MAP " << iChannel
+                                                 << " " << midiInstrumentMap[pChannel->midiMap()] << endl;
+                                 }
+ #endif
+ #ifdef CONFIG_FXSEND
+                                 int iChannelID = pChannel->channelID();
+                                 int *piFxSends = ::lscp_list_fxsends(m_pClient, iChannelID);
+                                 for (int iFxSend = 0;
+                                                 piFxSends && piFxSends[iFxSend] >= 0;
+                                                         iFxSend++) {
+                                         lscp_fxsend_info_t *pFxSendInfo = ::lscp_get_fxsend_info(
+                                                 m_pClient, iChannelID, piFxSends[iFxSend]);
+                                         if (pFxSendInfo) {
+                                                 ts << "CREATE FX_SEND " << iChannel
+                                                         << " " << pFxSendInfo->midi_controller;
+                                                 if (pFxSendInfo->name)
+                                                         ts << " '" << pFxSendInfo->name << "'";
+                                                 ts << endl;
+                                                 int *piRouting = pFxSendInfo->audio_routing;
+                                                 for (int iAudioSrc = 0;
+                                                                 piRouting && piRouting[iAudioSrc] >= 0;
+                                                                         iAudioSrc++) {
+                                                         ts << "SET FX_SEND AUDIO_OUTPUT_CHANNEL "
+                                                                 << iChannel
+                                                                 << " " << iFxSend
+                                                                 << " " << iAudioSrc
+                                                                 << " " << piRouting[iAudioSrc] << endl;
+                                                 }
+ #ifdef CONFIG_FXSEND_LEVEL
+                                                 ts << "SET FX_SEND LEVEL " << iChannel
+                                                         << " " << iFxSend
+                                                         << " " << pFxSendInfo->level << endl;
+ #endif
+                                         }       // Check for errors...
+                                         else if (::lscp_client_get_errno(m_pClient)) {
+                                                 appendMessagesClient("lscp_get_fxsend_info");
+                                                 iErrors++;
+                                         }
+                                 }
+ #endif
+                 ts << endl;
+             }
+         }
          // Try to keep it snappy :)
          QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
      }
+ #ifdef CONFIG_VOLUME
+         ts << "# " << tr("Global volume level") << endl;
+         ts << "SET VOLUME " << ::lscp_get_volume(m_pClient) << endl;
+         ts << endl;
+ #endif
      // Ok. we've wrote it.
      file.close();
+         // We're fornerly done.
+         QApplication::restoreOverrideCursor();
      // Have we any errors?
      if (iErrors > 0)
          appendMessagesError(tr("Some settings could not be saved\nto \"%1\" session file.\n\nSorry.").arg(sFilename));
-Line 637 
 bool qsamplerMainForm::saveSessionFile (
+Line 1077 
 bool qsamplerMainForm::saveSessionFile (
  }
+ // Session change receiver slot.
+ void qsamplerMainForm::sessionDirty (void)
+ {
+     // Just mark the dirty form.
+     m_iDirtyCount++;
+     // and update the form status...
+     stabilizeForm();
+ }
  //-------------------------------------------------------------------------
  // qsamplerMainForm -- File Action slots.
-Line 690 
 void qsamplerMainForm::fileReset (void)
+Line 1140 
 void qsamplerMainForm::fileReset (void)
          return;
      // Ask user whether he/she want's an internal sampler reset...
-     if (QMessageBox::warning(this, tr("Warning"),
+     if (QMessageBox::warning(this,
+                 QSAMPLER_TITLE ": " + tr("Warning"),
          tr("Resetting the sampler instance will close\n"
             "all device and channel configurations.\n\n"
             "Please note that this operation may cause\n"
-            "temporary MIDI and Audio disruption\n\n"
+            "temporary MIDI and Audio disruption.\n\n"
             "Do you want to reset the sampler engine now?"),
          tr("Reset"), tr("Cancel")) > 0)
          return;
+         // Trye closing the current session, first...
+         if (!closeSession(true))
+                 return;
      // Just do the reset, after closing down current session...
-     if (closeSession(true) && ::lscp_reset_sampler(m_pClient) != LSCP_OK) {
+         // Do the actual sampler reset...
-         appendMessagesClient("lscp_reset_sampler");
+         if (::lscp_reset_sampler(m_pClient) != LSCP_OK) {
-         appendMessagesError(tr("Could not reset sampler instance.\n\nSorry."));
+                 appendMessagesClient("lscp_reset_sampler");
-         return;
+                 appendMessagesError(tr("Could not reset sampler instance.\n\nSorry."));
-     }
+                 return;
+         }
      // Log this.
      appendMessages(tr("Sampler reset."));
+         // Make it a new session...
+         newSession();
  }
-Line 716 
 void qsamplerMainForm::fileRestart (void
+Line 1175 
 void qsamplerMainForm::fileRestart (void
  {
      if (m_pOptions == NULL)
          return;
      bool bRestart = true;
      // Ask user whether he/she want's a complete restart...
      // (if we're currently up and running)
      if (bRestart && m_pClient) {
-         bRestart = (QMessageBox::warning(this, tr("Warning"),
+         bRestart = (QMessageBox::warning(this,
+                         QSAMPLER_TITLE ": " + tr("Warning"),
              tr("New settings will be effective after\n"
                 "restarting the client/server connection.\n\n"
                 "Please note that this operation may cause\n"
-                "temporary MIDI and Audio disruption\n\n"
+                "temporary MIDI and Audio disruption.\n\n"
                 "Do you want to restart the connection now?"),
              tr("Restart"), tr("Cancel")) == 0);
      }
-Line 758 
 void qsamplerMainForm::editAddChannel (v
+Line 1218 
 void qsamplerMainForm::editAddChannel (v
      if (m_pClient == NULL)
          return;
-     // Create the new sampler channel.
+     // Just create the channel instance...
-     int iChannelID = ::lscp_add_channel(m_pClient);
+     qsamplerChannel *pChannel = new qsamplerChannel();
-     if (iChannelID < 0) {
+     if (pChannel == NULL)
-         appendMessagesClient("lscp_add_channel");
-         appendMessagesError(tr("Could not create the new channel.\n\nSorry."));
          return;
-     }
-     // Log this happening.
+     // Before we show it up, may be we'll
-     appendMessages(tr("Channel %1 created.").arg(iChannelID));
+     // better ask for some initial values?
+     if (!pChannel->channelSetup(this)) {
+         delete pChannel;
+         return;
+     }
-     // Just create the channel strip with given id.
+     // And give it to the strip (will own the channel instance, if successful).
-     createChannel(iChannelID, true);
+     if (!createChannelStrip(pChannel)) {
+         delete pChannel;
+         return;
+     }
-     // We'll be dirty, for sure...
+     // Make that an overall update.
      m_iDirtyCount++;
-     // Stabilize form anyway.
      stabilizeForm();
  }
-Line 785 
 void qsamplerMainForm::editRemoveChannel
+Line 1248 
 void qsamplerMainForm::editRemoveChannel
      if (m_pClient == NULL)
          return;
-     qsamplerChannelStrip *pChannel = activeChannel();
+     qsamplerChannelStrip *pChannelStrip = activeChannelStrip();
+     if (pChannelStrip == NULL)
+         return;
+     qsamplerChannel *pChannel = pChannelStrip->channel();
      if (pChannel == NULL)
          return;
      // Prompt user if he/she's sure about this...
      if (m_pOptions && m_pOptions->bConfirmRemove) {
-         if (QMessageBox::warning(this, tr("Warning"),
+         if (QMessageBox::warning(this,
+                         QSAMPLER_TITLE ": " + tr("Warning"),
              tr("About to remove channel:\n\n"
                 "%1\n\n"
                 "Are you sure?")
-                .arg(pChannel->caption()),
+                .arg(pChannelStrip->caption()),
              tr("OK"), tr("Cancel")) > 0)
              return;
      }
      // Remove the existing sampler channel.
-     if (::lscp_remove_channel(m_pClient, pChannel->channelID()) != LSCP_OK) {
+     if (!pChannel->removeChannel())
-         appendMessagesClient("lscp_remove_channel");
-         appendMessagesError(tr("Could not remove channel.\n\nSorry."));
          return;
-     }
-     // Log this happening.
-     appendMessages(tr("Channel %1 removed.").arg(pChannel->channelID()));
      // Just delete the channel strip.
-     delete pChannel;
+     delete pChannelStrip;
      // Do we auto-arrange?
      if (m_pOptions && m_pOptions->bAutoArrange)
          channelsArrange();
-Line 828 
 void qsamplerMainForm::editSetupChannel
+Line 1291 
 void qsamplerMainForm::editSetupChannel
      if (m_pClient == NULL)
          return;
-     qsamplerChannelStrip *pChannel = activeChannel();
+     qsamplerChannelStrip *pChannelStrip = activeChannelStrip();
-     if (pChannel == NULL)
+     if (pChannelStrip == NULL)
          return;
      // Just invoque the channel strip procedure.
-     pChannel->showChannelSetup(false);
+     pChannelStrip->channelSetup();
  }
-Line 843 
 void qsamplerMainForm::editResetChannel
+Line 1306 
 void qsamplerMainForm::editResetChannel
      if (m_pClient == NULL)
          return;
-     qsamplerChannelStrip *pChannel = activeChannel();
+     qsamplerChannelStrip *pChannelStrip = activeChannelStrip();
-     if (pChannel == NULL)
+     if (pChannelStrip == NULL)
          return;
-     // Remove the existing sampler channel.
+     // Just invoque the channel strip procedure.
-     if (::lscp_reset_channel(m_pClient, pChannel->channelID()) != LSCP_OK) {
+     pChannelStrip->channelReset();
-         appendMessagesClient("lscp_reset_channel");
+ }
-         appendMessagesError(tr("Could not reset channel.\n\nSorry."));
-         return;
-     }
-     // Log this.
-     appendMessages(tr("Channel %1 reset.").arg(pChannel->channelID()));
-     // Refresh channel strip info.
+ // Reset all sampler channels.
-     pChannel->updateChannelInfo();
+ void qsamplerMainForm::editResetAllChannels (void)
+ {
+         if (m_pClient == NULL)
+                 return;
+         // Invoque the channel strip procedure,
+         // for all channels out there...
+         m_pWorkspace->setUpdatesEnabled(false);
+         QWidgetList wlist = m_pWorkspace->windowList();
+         for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
+                 qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
+                 if (pChannelStrip)
+                         pChannelStrip->channelReset();
+         }
+         m_pWorkspace->setUpdatesEnabled(true);
  }
-Line 910 
 void qsamplerMainForm::viewMessages ( bo
+Line 1382 
 void qsamplerMainForm::viewMessages ( bo
  }
+ // Show/hide the MIDI instrument list-view form.
+ void qsamplerMainForm::viewInstruments (void)
+ {
+         if (m_pOptions == NULL)
+                 return;
+         if (m_pInstrumentListForm) {
+                 m_pOptions->saveWidgetGeometry(m_pInstrumentListForm);
+                 if (m_pInstrumentListForm->isVisible()) {
+                         m_pInstrumentListForm->hide();
+                 } else {
+                         m_pInstrumentListForm->show();
+                         m_pInstrumentListForm->raise();
+                         m_pInstrumentListForm->setActiveWindow();
+                 }
+         }
+ }
+ // Show/hide the device configurator form.
+ void qsamplerMainForm::viewDevices (void)
+ {
+         if (m_pOptions == NULL)
+                 return;
+         if (m_pDeviceForm) {
+                 m_pOptions->saveWidgetGeometry(m_pDeviceForm);
+                 if (m_pDeviceForm->isVisible()) {
+                         m_pDeviceForm->hide();
+                 } else {
+                         m_pDeviceForm->show();
+                         m_pDeviceForm->raise();
+                         m_pDeviceForm->setActiveWindow();
+                 }
+         }
+ }
  // Show options dialog.
  void qsamplerMainForm::viewOptions (void)
  {
-Line 919 
 void qsamplerMainForm::viewOptions (void
+Line 1429 
 void qsamplerMainForm::viewOptions (void
      qsamplerOptionsForm *pOptionsForm = new qsamplerOptionsForm(this);
      if (pOptionsForm) {
          // Check out some initial nullities(tm)...
-         qsamplerChannelStrip *pChannel = activeChannel();
+         qsamplerChannelStrip *pChannelStrip = activeChannelStrip();
-         if (m_pOptions->sDisplayFont.isEmpty() && pChannel)
+         if (m_pOptions->sDisplayFont.isEmpty() && pChannelStrip)
-             m_pOptions->sDisplayFont = pChannel->displayFont().toString();
+             m_pOptions->sDisplayFont = pChannelStrip->displayFont().toString();
          if (m_pOptions->sMessagesFont.isEmpty() && m_pMessages)
              m_pOptions->sMessagesFont = m_pMessages->messagesFont().toString();
          // To track down deferred or immediate changes.
-Line 931 
 void qsamplerMainForm::viewOptions (void
+Line 1441 
 void qsamplerMainForm::viewOptions (void
          bool    bOldServerStart     = m_pOptions->bServerStart;
          QString sOldServerCmdLine   = m_pOptions->sServerCmdLine;
          QString sOldDisplayFont     = m_pOptions->sDisplayFont;
+         bool    bOldDisplayEffect   = m_pOptions->bDisplayEffect;
          int     iOldMaxVolume       = m_pOptions->iMaxVolume;
          QString sOldMessagesFont    = m_pOptions->sMessagesFont;
+         bool    bOldKeepOnTop       = m_pOptions->bKeepOnTop;
          bool    bOldStdoutCapture   = m_pOptions->bStdoutCapture;
          int     bOldMessagesLimit   = m_pOptions->bMessagesLimit;
          int     iOldMessagesLimitLines = m_pOptions->iMessagesLimitLines;
          bool    bOldCompletePath    = m_pOptions->bCompletePath;
+         bool    bOldInstrumentNames = m_pOptions->bInstrumentNames;
          int     iOldMaxRecentFiles  = m_pOptions->iMaxRecentFiles;
          // Load the current setup settings.
          pOptionsForm->setup(m_pOptions);
-Line 944 
 void qsamplerMainForm::viewOptions (void
+Line 1457 
 void qsamplerMainForm::viewOptions (void
          if (pOptionsForm->exec()) {
              // Warn if something will be only effective on next run.
              if (( bOldStdoutCapture && !m_pOptions->bStdoutCapture) ||
-                 (!bOldStdoutCapture &&  m_pOptions->bStdoutCapture)) {
+                 (!bOldStdoutCapture &&  m_pOptions->bStdoutCapture) ||
-                 QMessageBox::information(this, tr("Information"),
+                 ( bOldKeepOnTop     && !m_pOptions->bKeepOnTop)     ||
+                 (!bOldKeepOnTop     &&  m_pOptions->bKeepOnTop)) {
+                 QMessageBox::information(this,
+                                         QSAMPLER_TITLE ": " + tr("Information"),
                      tr("Some settings may be only effective\n"
                         "next time you start this program."), tr("OK"));
                  updateMessagesCapture();
-Line 955 
 void qsamplerMainForm::viewOptions (void
+Line 1471 
 void qsamplerMainForm::viewOptions (void
                  (!bOldCompletePath &&  m_pOptions->bCompletePath) ||
                  (iOldMaxRecentFiles != m_pOptions->iMaxRecentFiles))
                  updateRecentFilesMenu();
+             if (( bOldInstrumentNames && !m_pOptions->bInstrumentNames) ||
+                 (!bOldInstrumentNames &&  m_pOptions->bInstrumentNames))
+                 updateInstrumentNames();
+             if (( bOldDisplayEffect && !m_pOptions->bDisplayEffect) ||
+                 (!bOldDisplayEffect &&  m_pOptions->bDisplayEffect))
+                 updateDisplayEffect();
              if (sOldDisplayFont != m_pOptions->sDisplayFont)
                  updateDisplayFont();
              if (iOldMaxVolume != m_pOptions->iMaxVolume)
-Line 997 
 void qsamplerMainForm::channelsArrange (
+Line 1519 
 void qsamplerMainForm::channelsArrange (
      m_pWorkspace->setUpdatesEnabled(false);
      int y = 0;
      for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
-         qsamplerChannelStrip *pChannel = (qsamplerChannelStrip *) wlist.at(iChannel);
+         qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
-     /*  if (pChannel->testWState(WState_Maximized | WState_Minimized)) {
+     /*  if (pChannelStrip->testWState(WState_Maximized | WState_Minimized)) {
              // Prevent flicker...
-             pChannel->hide();
+             pChannelStrip->hide();
-             pChannel->showNormal();
+             pChannelStrip->showNormal();
          }   */
-         pChannel->adjustSize();
+         pChannelStrip->adjustSize();
          int iWidth  = m_pWorkspace->width();
-         if (iWidth < pChannel->width())
+         if (iWidth < pChannelStrip->width())
-             iWidth = pChannel->width();
+             iWidth = pChannelStrip->width();
-     //  int iHeight = pChannel->height() + pChannel->parentWidget()->baseSize().height();
+     //  int iHeight = pChannelStrip->height() + pChannelStrip->parentWidget()->baseSize().height();
-         int iHeight = pChannel->parentWidget()->frameGeometry().height();
+         int iHeight = pChannelStrip->parentWidget()->frameGeometry().height();
-         pChannel->parentWidget()->setGeometry(0, y, iWidth, iHeight);
+         pChannelStrip->parentWidget()->setGeometry(0, y, iWidth, iHeight);
          y += iHeight;
      }
      m_pWorkspace->setUpdatesEnabled(true);
      stabilizeForm();
  }
-Line 1062 
 void qsamplerMainForm::helpAbout (void)
+Line 1584 
 void qsamplerMainForm::helpAbout (void)
      sText += tr("GIG (libgig) file support disabled.");
      sText += "</font></small><br />";
  #endif
+ #ifndef CONFIG_INSTRUMENT_NAME
+     sText += "<small><font color=\"red\">";
+     sText += tr("LSCP (liblscp) instrument_name support disabled.");
+     sText += "</font></small><br />";
+ #endif
+ #ifndef CONFIG_MUTE_SOLO
+     sText += "<small><font color=\"red\">";
+     sText += tr("Sampler channel Mute/Solo support disabled.");
+     sText += "</font></small><br />";
+ #endif
+ #ifndef CONFIG_AUDIO_ROUTING
+     sText += "<small><font color=\"red\">";
+     sText += tr("LSCP (liblscp) audio_routing support disabled.");
+     sText += "</font></small><br />";
+ #endif
+ #ifndef CONFIG_FXSEND
+     sText += "<small><font color=\"red\">";
+     sText += tr("Sampler channel Effect Sends support disabled.");
+     sText += "</font></small><br />";
+ #endif
+ #ifndef CONFIG_VOLUME
+     sText += "<small><font color=\"red\">";
+     sText += tr("Global volume support disabled.");
+     sText += "</font></small><br />";
+ #endif
+ #ifndef CONFIG_MIDI_INSTRUMENT
+     sText += "<small><font color=\"red\">";
+     sText += tr("MIDI instrument mapping support disabled.");
+     sText += "</font></small><br />";
+ #endif
      sText += "<br />\n";
      sText += tr("Using") + ": ";
      sText += ::lscp_client_package();
      sText += " ";
      sText += ::lscp_client_version();
+ #ifdef CONFIG_LIBGIG
+     sText += ", ";
+     sText += gig::libraryName().c_str();
+     sText += " ";
+     sText += gig::libraryVersion().c_str();
+ #endif
      sText += "<br />\n";
      sText += "<br />\n";
      sText += tr("Website") + ": <a href=\"" QSAMPLER_WEBSITE "\">" QSAMPLER_WEBSITE "</a><br />\n";
-Line 1089 
 void qsamplerMainForm::helpAbout (void)
+Line 1647 
 void qsamplerMainForm::helpAbout (void)
  void qsamplerMainForm::stabilizeForm (void)
  {
      // Update the main application caption...
-     QString sSessioName = sessionName(m_sFilename);
+     QString sSessionName = sessionName(m_sFilename);
      if (m_iDirtyCount > 0)
-         sSessioName += '*';
+         sSessionName += " *";
-     setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessioName));
+     setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessionName));
      // Update the main menu state...
-     qsamplerChannelStrip *pChannel = activeChannel();
+     qsamplerChannelStrip *pChannelStrip = activeChannelStrip();
      bool bHasClient  = (m_pOptions != NULL && m_pClient != NULL);
-     bool bHasChannel = (bHasClient && pChannel != NULL);
+     bool bHasChannel = (bHasClient && pChannelStrip != NULL);
      fileNewAction->setEnabled(bHasClient);
      fileOpenAction->setEnabled(bHasClient);
      fileSaveAction->setEnabled(bHasClient && m_iDirtyCount > 0);
-Line 1108 
 void qsamplerMainForm::stabilizeForm (vo
+Line 1666 
 void qsamplerMainForm::stabilizeForm (vo
      editRemoveChannelAction->setEnabled(bHasChannel);
      editSetupChannelAction->setEnabled(bHasChannel);
      editResetChannelAction->setEnabled(bHasChannel);
-     channelsArrangeAction->setEnabled(bHasChannel);
+     editResetAllChannelsAction->setEnabled(bHasChannel);
      viewMessagesAction->setOn(m_pMessages && m_pMessages->isVisible());
+ #ifdef CONFIG_MIDI_INSTRUMENT
+         viewInstrumentsAction->setOn(m_pInstrumentListForm
+                 && m_pInstrumentListForm->isVisible());
+         viewInstrumentsAction->setEnabled(bHasClient);
+ #endif
+         viewDevicesAction->setOn(m_pDeviceForm
+                 && m_pDeviceForm->isVisible());
+     viewDevicesAction->setEnabled(bHasClient);
+     channelsArrangeAction->setEnabled(bHasChannel);
+ #ifdef CONFIG_VOLUME
+         // Toolbar widgets are also affected...
+     m_pVolumeSlider->setEnabled(bHasClient);
+     m_pVolumeSpinBox->setEnabled(bHasClient);
+ #endif
      // Client/Server status...
      if (bHasClient) {
-         m_status[QSAMPLER_STATUS_CLIENT]->setText(tr("Connected"));
+         m_statusItem[QSAMPLER_STATUS_CLIENT]->setText(tr("Connected"));
-         m_status[QSAMPLER_STATUS_SERVER]->setText(m_pOptions->sServerHost + ":" + QString::number(m_pOptions->iServerPort));
+         m_statusItem[QSAMPLER_STATUS_SERVER]->setText(m_pOptions->sServerHost + ":" + QString::number(m_pOptions->iServerPort));
      } else {
-         m_status[QSAMPLER_STATUS_CLIENT]->clear();
+         m_statusItem[QSAMPLER_STATUS_CLIENT]->clear();
-         m_status[QSAMPLER_STATUS_SERVER]->clear();
+         m_statusItem[QSAMPLER_STATUS_SERVER]->clear();
      }
      // Channel status...
      if (bHasChannel)
-         m_status[QSAMPLER_STATUS_CHANNEL]->setText(pChannel->caption());
+         m_statusItem[QSAMPLER_STATUS_CHANNEL]->setText(pChannelStrip->caption());
      else
-         m_status[QSAMPLER_STATUS_CHANNEL]->clear();
+         m_statusItem[QSAMPLER_STATUS_CHANNEL]->clear();
      // Session status...
      if (m_iDirtyCount > 0)
-         m_status[QSAMPLER_STATUS_SESSION]->setText(tr("MOD"));
+         m_statusItem[QSAMPLER_STATUS_SESSION]->setText(tr("MOD"));
      else
-         m_status[QSAMPLER_STATUS_SESSION]->clear();
+         m_statusItem[QSAMPLER_STATUS_SESSION]->clear();
      // Recent files menu.
      m_pRecentFilesMenu->setEnabled(bHasClient && m_pOptions->recentFiles.count() > 0);
-Line 1139 
 void qsamplerMainForm::stabilizeForm (vo
+Line 1712 
 void qsamplerMainForm::stabilizeForm (vo
  }
+ // Global volume change receiver slot.
+ void qsamplerMainForm::volumeChanged ( int iVolume )
+ {
+ #ifdef CONFIG_VOLUME
+         if (m_iVolumeChanging > 0)
+                 return;
+         m_iVolumeChanging++;
+         // Update the toolbar widgets...
+         if (m_pVolumeSlider->value()  != iVolume)
+                 m_pVolumeSlider->setValue(iVolume);
+         if (m_pVolumeSpinBox->value() != iVolume)
+                 m_pVolumeSpinBox->setValue(iVolume);
+         // Do it as commanded...
+         float fVolume = 0.01f * float(iVolume);
+         if (::lscp_set_volume(m_pClient, fVolume) == LSCP_OK)
+                 appendMessages(QObject::tr("Volume: %1.").arg(fVolume));
+         else
+                 appendMessagesClient("lscp_set_volume");
+         m_iVolumeChanging--;
+         m_iDirtyCount++;
+         stabilizeForm();
+ #endif
+ }
  // Channel change receiver slot.
- void qsamplerMainForm::channelChanged( qsamplerChannelStrip * )
+ void qsamplerMainForm::channelStripChanged( qsamplerChannelStrip *pChannelStrip )
  {
+         // Add this strip to the changed list...
+         if (m_changedStrips.containsRef(pChannelStrip) == 0) {
+                 m_changedStrips.append(pChannelStrip);
+                 pChannelStrip->resetErrorCount();
+         }
      // Just mark the dirty form.
      m_iDirtyCount++;
      // and update the form status...
-Line 1149 
 void qsamplerMainForm::channelChanged( q
+Line 1760 
 void qsamplerMainForm::channelChanged( q
  }
+ // Grab and restore current sampler channels session.
+ void qsamplerMainForm::updateSession (void)
+ {
+ #ifdef CONFIG_VOLUME
+         int iVolume = ::lroundf(100.0f * ::lscp_get_volume(m_pClient));
+         m_iVolumeChanging++;
+         m_pVolumeSlider->setValue(iVolume);
+         m_pVolumeSpinBox->setValue(iVolume);
+         m_iVolumeChanging--;
+ #endif
+ #ifdef CONFIG_MIDI_INSTRUMENT
+         // FIXME: Make some room for default instrument maps...
+         int iMaps = ::lscp_get_midi_instrument_maps(m_pClient);
+         if (iMaps < 0)
+                 appendMessagesClient("lscp_get_midi_instrument_maps");
+         else if (iMaps < 1) {
+                 ::lscp_add_midi_instrument_map(m_pClient, tr("Chromatic").latin1());
+                 ::lscp_add_midi_instrument_map(m_pClient, tr("Drum Kits").latin1());
+         }
+ #endif
+         // Retrieve the current channel list.
+         int *piChannelIDs = ::lscp_list_channels(m_pClient);
+         if (piChannelIDs == NULL) {
+                 if (::lscp_client_get_errno(m_pClient)) {
+                         appendMessagesClient("lscp_list_channels");
+                         appendMessagesError(tr("Could not get current list of channels.\n\nSorry."));
+                 }
+         } else {
+                 // Try to (re)create each channel.
+                 m_pWorkspace->setUpdatesEnabled(false);
+                 for (int iChannel = 0; piChannelIDs[iChannel] >= 0; iChannel++) {
+                         // Check if theres already a channel strip for this one...
+                         if (!channelStrip(piChannelIDs[iChannel]))
+                                 createChannelStrip(new qsamplerChannel(piChannelIDs[iChannel]));
+                 }
+                 m_pWorkspace->setUpdatesEnabled(true);
+         }
+     // Do we auto-arrange?
+     if (m_pOptions && m_pOptions->bAutoArrange)
+         channelsArrange();
+         // Remember to refresh devices and instruments...
+         if (m_pInstrumentListForm)
+             m_pInstrumentListForm->refreshInstruments();
+         if (m_pDeviceForm)
+             m_pDeviceForm->refreshDevices();
+ }
  // Update the recent files list and menu.
  void qsamplerMainForm::updateRecentFiles ( const QString& sFilename )
  {
-Line 1193 
 void qsamplerMainForm::updateRecentFiles
+Line 1855 
 void qsamplerMainForm::updateRecentFiles
  }
+ // Force update of the channels instrument names mode.
+ void qsamplerMainForm::updateInstrumentNames (void)
+ {
+     // Full channel list update...
+     QWidgetList wlist = m_pWorkspace->windowList();
+     if (wlist.isEmpty())
+         return;
+     m_pWorkspace->setUpdatesEnabled(false);
+     for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
+         qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
+         if (pChannelStrip)
+             pChannelStrip->updateInstrumentName(true);
+     }
+     m_pWorkspace->setUpdatesEnabled(true);
+ }
  // Force update of the channels display font.
  void qsamplerMainForm::updateDisplayFont (void)
  {
-Line 1214 
 void qsamplerMainForm::updateDisplayFont
+Line 1894 
 void qsamplerMainForm::updateDisplayFont
      m_pWorkspace->setUpdatesEnabled(false);
      for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
-         qsamplerChannelStrip *pChannel = (qsamplerChannelStrip *) wlist.at(iChannel);
+         qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
-         pChannel->setDisplayFont(font);
+         if (pChannelStrip)
+             pChannelStrip->setDisplayFont(font);
+     }
+     m_pWorkspace->setUpdatesEnabled(true);
+ }
+ // Update channel strips background effect.
+ void qsamplerMainForm::updateDisplayEffect (void)
+ {
+    QPixmap pm;
+     if (m_pOptions->bDisplayEffect)
+         pm = QPixmap::fromMimeSource("displaybg1.png");
+     // Full channel list update...
+     QWidgetList wlist = m_pWorkspace->windowList();
+     if (wlist.isEmpty())
+         return;
+     m_pWorkspace->setUpdatesEnabled(false);
+     for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
+         qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
+         if (pChannelStrip)
+             pChannelStrip->setDisplayBackground(pm);
      }
      m_pWorkspace->setUpdatesEnabled(true);
  }
-Line 1227 
 void qsamplerMainForm::updateMaxVolume (
+Line 1930 
 void qsamplerMainForm::updateMaxVolume (
      if (m_pOptions == NULL)
          return;
+ #ifdef CONFIG_VOLUME
+         m_iVolumeChanging++;
+         m_pVolumeSlider->setMaxValue(m_pOptions->iMaxVolume);
+         m_pVolumeSpinBox->setMaxValue(m_pOptions->iMaxVolume);
+         m_iVolumeChanging--;
+ #endif
      // Full channel list update...
      QWidgetList wlist = m_pWorkspace->windowList();
      if (wlist.isEmpty())
-Line 1234 
 void qsamplerMainForm::updateMaxVolume (
+Line 1944 
 void qsamplerMainForm::updateMaxVolume (
      m_pWorkspace->setUpdatesEnabled(false);
      for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
-         qsamplerChannelStrip *pChannel = (qsamplerChannelStrip *) wlist.at(iChannel);
+         qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
-         pChannel->setMaxVolume(m_pOptions->iMaxVolume);
+         if (pChannelStrip)
+             pChannelStrip->setMaxVolume(m_pOptions->iMaxVolume);
      }
      m_pWorkspace->setUpdatesEnabled(true);
  }
-Line 1274 
 void qsamplerMainForm::appendMessagesErr
+Line 1985 
 void qsamplerMainForm::appendMessagesErr
      appendMessagesColor(s.simplifyWhiteSpace(), "#ff0000");
-     QMessageBox::critical(this, tr("Error"), s, tr("Cancel"));
+         // Make it look responsive...:)
+         QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
+     QMessageBox::critical(this,
+                 QSAMPLER_TITLE ": " + tr("Error"), s, tr("Cancel"));
  }
-Line 1287 
 void qsamplerMainForm::appendMessagesCli
+Line 2002 
 void qsamplerMainForm::appendMessagesCli
      appendMessagesColor(s + QString(": %1 (errno=%2)")
          .arg(::lscp_client_get_result(m_pClient))
          .arg(::lscp_client_get_errno(m_pClient)), "#996666");
+         // Make it look responsive...:)
+         QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
  }
-Line 1314 
 void qsamplerMainForm::updateMessagesLim
+Line 2032 
 void qsamplerMainForm::updateMessagesLim
          if (m_pOptions->bMessagesLimit)
              m_pMessages->setMessagesLimit(m_pOptions->iMessagesLimitLines);
          else
-             m_pMessages->setMessagesLimit(0);
+             m_pMessages->setMessagesLimit(-1);
      }
  }
-Line 1334 
 void qsamplerMainForm::updateMessagesCap
+Line 2052 
 void qsamplerMainForm::updateMessagesCap
  // qsamplerMainForm -- MDI channel strip management.
  // The channel strip creation executive.
- void qsamplerMainForm::createChannel ( int iChannelID, bool bPrompt )
+ qsamplerChannelStrip *qsamplerMainForm::createChannelStrip ( qsamplerChannel *pChannel )
  {
-     if (m_pClient == NULL)
+     if (m_pClient == NULL || pChannel == NULL)
-         return;
+         return NULL;
      // Prepare for auto-arrange?
-     qsamplerChannelStrip *pChannel = NULL;
+     qsamplerChannelStrip *pChannelStrip = NULL;
      int y = 0;
      if (m_pOptions && m_pOptions->bAutoArrange) {
          QWidgetList wlist = m_pWorkspace->windowList();
          for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
-             pChannel = (qsamplerChannelStrip *) wlist.at(iChannel);
+             pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
-         //  y += pChannel->height() + pChannel->parentWidget()->baseSize().height();
+                         if (pChannelStrip) {
-             y += pChannel->parentWidget()->frameGeometry().height();
+                         //  y += pChannelStrip->height() + pChannelStrip->parentWidget()->baseSize().height();
+                                 y += pChannelStrip->parentWidget()->frameGeometry().height();
+                         }
          }
      }
      // Add a new channel itema...
      WFlags wflags = Qt::WStyle_Customize | Qt::WStyle_Tool | Qt::WStyle_Title | Qt::WStyle_NoBorder;
-     pChannel = new qsamplerChannelStrip(m_pWorkspace, 0, wflags);
+     pChannelStrip = new qsamplerChannelStrip(m_pWorkspace, 0, wflags);
-     pChannel->setMaxVolume(m_pOptions->iMaxVolume);
+     if (pChannelStrip == NULL)
-     pChannel->setup(this, iChannelID);
+         return NULL;
-     // We'll need a display font.
-     QFont font;
+     // Actual channel strip setup...
-     if (m_pOptions && font.fromString(m_pOptions->sDisplayFont))
+     pChannelStrip->setup(pChannel);
-         pChannel->setDisplayFont(font);
+         QObject::connect(pChannelStrip,
-     // Track channel setup changes.
+                 SIGNAL(channelChanged(qsamplerChannelStrip *)),
-     QObject::connect(pChannel, SIGNAL(channelChanged(qsamplerChannelStrip *)), this, SLOT(channelChanged(qsamplerChannelStrip *)));
+                 SLOT(channelStripChanged(qsamplerChannelStrip *)));
-     // Before we show it up, may be we'll
+     // Set some initial aesthetic options...
-     // better ask for some initial values?
+     if (m_pOptions) {
-     if (bPrompt)
+         // Background display effect...
-         pChannel->showChannelSetup(true);
+         pChannelStrip->setDisplayEffect(m_pOptions->bDisplayEffect);
+         // We'll need a display font.
+         QFont font;
+         if (font.fromString(m_pOptions->sDisplayFont))
+             pChannelStrip->setDisplayFont(font);
+         // Maximum allowed volume setting.
+         pChannelStrip->setMaxVolume(m_pOptions->iMaxVolume);
+     }
      // Now we show up us to the world.
-     pChannel->show();
+     pChannelStrip->show();
      // Only then, we'll auto-arrange...
      if (m_pOptions && m_pOptions->bAutoArrange) {
          int iWidth  = m_pWorkspace->width();
      //  int iHeight = pChannel->height() + pChannel->parentWidget()->baseSize().height();
-         int iHeight = pChannel->parentWidget()->frameGeometry().height();
+         int iHeight = pChannelStrip->parentWidget()->frameGeometry().height();
-         pChannel->parentWidget()->setGeometry(0, y, iWidth, iHeight);
+         pChannelStrip->parentWidget()->setGeometry(0, y, iWidth, iHeight);
      }
+         // This is pretty new, so we'll watch for it closely.
+         channelStripChanged(pChannelStrip);
+     // Return our successful reference...
+     return pChannelStrip;
  }
  // Retrieve the active channel strip.
- qsamplerChannelStrip *qsamplerMainForm::activeChannel (void)
+ qsamplerChannelStrip *qsamplerMainForm::activeChannelStrip (void)
  {
      return (qsamplerChannelStrip *) m_pWorkspace->activeWindow();
  }
  // Retrieve a channel strip by index.
- qsamplerChannelStrip *qsamplerMainForm::channelAt ( int iChannel )
+ qsamplerChannelStrip *qsamplerMainForm::channelStripAt ( int iChannel )
  {
      QWidgetList wlist = m_pWorkspace->windowList();
      if (wlist.isEmpty())
-         return 0;
+         return NULL;
      return (qsamplerChannelStrip *) wlist.at(iChannel);
  }
+ // Retrieve a channel strip by sampler channel id.
+ qsamplerChannelStrip *qsamplerMainForm::channelStrip ( int iChannelID )
+ {
+         QWidgetList wlist = m_pWorkspace->windowList();
+         if (wlist.isEmpty())
+                 return NULL;
+         for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
+                 qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
+                 if (pChannelStrip) {
+                         qsamplerChannel *pChannel = pChannelStrip->channel();
+                         if (pChannel && pChannel->channelID() == iChannelID)
+                                 return pChannelStrip;
+                 }
+         }
+         // Not found.
+         return NULL;
+ }
  // Construct the windows menu.
  void qsamplerMainForm::channelsMenuAboutToShow (void)
  {
-Line 1407 
 void qsamplerMainForm::channelsMenuAbout
+Line 2162 
 void qsamplerMainForm::channelsMenuAbout
      if (!wlist.isEmpty()) {
          channelsMenu->insertSeparator();
          for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
-             qsamplerChannelStrip *pChannel = (qsamplerChannelStrip *) wlist.at(iChannel);
+             qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
-             int iItemID = channelsMenu->insertItem(pChannel->caption(), this, SLOT(channelsMenuActivated(int)));
+             if (pChannelStrip) {
-             channelsMenu->setItemParameter(iItemID, iChannel);
+                 int iItemID = channelsMenu->insertItem(pChannelStrip->caption(), this, SLOT(channelsMenuActivated(int)));
-             channelsMenu->setItemChecked(iItemID, activeChannel() == pChannel);
+                 channelsMenu->setItemParameter(iItemID, iChannel);
+                 channelsMenu->setItemChecked(iItemID, activeChannelStrip() == pChannelStrip);
+             }
          }
      }
  }
-Line 1419 
 void qsamplerMainForm::channelsMenuAbout
+Line 2176 
 void qsamplerMainForm::channelsMenuAbout
  // Windows menu activation slot
  void qsamplerMainForm::channelsMenuActivated ( int iChannel )
  {
-     qsamplerChannelStrip *pChannel = channelAt(iChannel);
+     qsamplerChannelStrip *pChannelStrip = channelStripAt(iChannel);
-     if (pChannel)
+     if (pChannelStrip)
-         pChannel->showNormal();
+         pChannelStrip->showNormal();
-     pChannel->setFocus();
+     pChannelStrip->setFocus();
  }
-Line 1460 
 void qsamplerMainForm::timerSlot (void)
+Line 2217 
 void qsamplerMainForm::timerSlot (void)
              }
          }
      }
-         // Refresh each channel usage, on each period...
+         if (m_pClient) {
-     if (m_pClient && m_pOptions->bAutoRefresh && m_pWorkspace->isUpdatesEnabled()) {
+                 // Update the channel information for each pending strip...
-         m_iTimerSlot += QSAMPLER_TIMER_MSECS;
+                 if (m_changedStrips.count() > 0) {
-         if (m_iTimerSlot >= m_pOptions->iAutoRefreshTime)  {
+                         for (qsamplerChannelStrip *pChannelStrip = m_changedStrips.first();
-             m_iTimerSlot = 0;
+                                         pChannelStrip; pChannelStrip = m_changedStrips.next()) {
-             QWidgetList wlist = m_pWorkspace->windowList();
+                                 // If successfull, remove from pending list...
-             for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
+                                 if (pChannelStrip->updateChannelInfo())
-                 qsamplerChannelStrip *pChannel = (qsamplerChannelStrip *) wlist.at(iChannel);
+                                         m_changedStrips.remove(pChannelStrip);
-                 if (pChannel->isVisible())
+                         }
-                     pChannel->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();
+                                 }
+                         }
+                 }
+         }
      // Register the next timer slot.
      QTimer::singleShot(QSAMPLER_TIMER_MSECS, this, SLOT(timerSlot()));
-Line 1495 
 void qsamplerMainForm::startServer (void
+Line 2266 
 void qsamplerMainForm::startServer (void
      // Is the server process instance still here?
      if (m_pServer) {
-         switch (QMessageBox::warning(this, tr("Warning"),
+         switch (QMessageBox::warning(this,
+                         QSAMPLER_TITLE ": " + tr("Warning"),
              tr("Could not start the LinuxSampler server.\n\n"
                 "Maybe it ss already started."),
              tr("Stop"), tr("Kill"), tr("Cancel"))) {
-Line 1516 
 void qsamplerMainForm::startServer (void
+Line 2288 
 void qsamplerMainForm::startServer (void
      m_pServer = new QProcess(this);
      // Setup stdout/stderr capture...
-     //if (m_pOptions->bStdoutCapture) {
+         //      if (m_pOptions->bStdoutCapture) {
-         m_pServer->setCommunication(QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr);
+                 m_pServer->setCommunication(
-         QObject::connect(m_pServer, SIGNAL(readyReadStdout()), this, SLOT(readServerStdout()));
+                         QProcess::Stdout | QProcess::Stderr | QProcess::DupStderr);
-         QObject::connect(m_pServer, SIGNAL(readyReadStderr()), this, SLOT(readServerStdout()));
+                 QObject::connect(m_pServer,
-     //}
+                         SIGNAL(readyReadStdout()),
-     // The unforgiveable signal communication...
+                         SLOT(readServerStdout()));
-     QObject::connect(m_pServer, SIGNAL(processExited()), this, SLOT(processServerExit()));
+                 QObject::connect(m_pServer,
+                         SIGNAL(readyReadStderr()),
+                         SLOT(readServerStdout()));
+         //      }
+         // The unforgiveable signal communication...
+         QObject::connect(m_pServer,
+                 SIGNAL(processExited()),
+                 SLOT(processServerExit()));
      // Build process arguments...
      m_pServer->setArguments(QStringList::split(' ', m_pOptions->sServerCmdLine));
-Line 1654 
 bool qsamplerMainForm::startClient (void
+Line 2433 
 bool qsamplerMainForm::startClient (void
      ::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();
-Line 1663 
 bool qsamplerMainForm::startClient (void
+Line 2446 
 bool qsamplerMainForm::startClient (void
      // Log success here.
      appendMessages(tr("Client connected."));
+         // Hard-notify instrumnet and device configuration forms,
+         // if visible, that we're ready...
+         if (m_pInstrumentListForm)
+             m_pInstrumentListForm->refreshInstruments();
+         if (m_pDeviceForm)
+             m_pDeviceForm->refreshDevices();
      // Is any session pending to be loaded?
      if (!m_pOptions->sSessionFile.isEmpty()) {
          // Just load the prabably startup session...
-Line 1697 
 void qsamplerMainForm::stopClient (void)
+Line 2487 
 void qsamplerMainForm::stopClient (void)
      // channels from the back-end server.
      m_iDirtyCount = 0;
      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;
+         // Hard-notify instrumnet and device configuration forms,
+         // if visible, that we're running out...
+         if (m_pInstrumentListForm)
+             m_pInstrumentListForm->refreshInstruments();
+         if (m_pDeviceForm)
+             m_pDeviceForm->refreshDevices();
      // Log final here.
      appendMessages(tr("Client disconnected."));

 Legend:



Removed from v.263
 


changed lines


 
Added in v.1036
 Legend:



Removed from v.263
 


changed lines


 
Added in v.1036
-Removed from v.263
+Added in v.1036

	ViewVC Help
Powered by ViewVC