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

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

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 661 by capela, Fri Jun 17 22:43:56 2005 UTC revision 1013 by capela, Mon Jan 8 16:52:48 2007 UTC
# Line 2  Line 2 
2  //  //
3  // ui.h extension file, included from the uic-generated form implementation.  // ui.h extension file, included from the uic-generated form implementation.
4  /****************************************************************************  /****************************************************************************
5     Copyright (C) 2004-2005, rncbc aka Rui Nuno Capela. All rights reserved.     Copyright (C) 2004-2007, rncbc aka Rui Nuno Capela. All rights reserved.
6    
7     This program is free software; you can redistribute it and/or     This program is free software; you can redistribute it and/or
8     modify it under the terms of the GNU General Public License     modify it under the terms of the GNU General Public License
# Line 14  Line 14 
14     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15     GNU General Public License for more details.     GNU General Public License for more details.
16    
17     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
18     along with this program; if not, write to the Free Software     with this program; if not, write to the Free Software Foundation, Inc.,
19     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20    
21  *****************************************************************************/  *****************************************************************************/
22    
# Line 41  Line 41 
41  #include "qsamplerMessages.h"  #include "qsamplerMessages.h"
42    
43  #include "qsamplerChannelStrip.h"  #include "qsamplerChannelStrip.h"
44    #include "qsamplerInstrumentList.h"
45    
46    #include "qsamplerInstrumentListForm.h"
47  #include "qsamplerDeviceForm.h"  #include "qsamplerDeviceForm.h"
48  #include "qsamplerOptionsForm.h"  #include "qsamplerOptionsForm.h"
49    
 #include "config.h"  
   
50  #ifdef HAVE_SIGNAL_H  #ifdef HAVE_SIGNAL_H
51  #include <signal.h>  #include <signal.h>
52  #endif  #endif
# Line 104  private: Line 104  private:
104  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
105  // qsamplerMainForm -- Main window form implementation.  // qsamplerMainForm -- Main window form implementation.
106    
107    // Kind of singleton reference.
108    qsamplerMainForm *qsamplerMainForm::g_pMainForm = NULL;
109    
110    
111  // Kind of constructor.  // Kind of constructor.
112  void qsamplerMainForm::init (void)  void qsamplerMainForm::init (void)
113  {  {
114            // Pseudo-singleton reference setup.
115            g_pMainForm = this;
116    
117      // Initialize some pointer references.      // Initialize some pointer references.
118      m_pOptions = NULL;      m_pOptions = NULL;
119    
120      // All child forms are to be created later, not earlier than setup.      // All child forms are to be created later, not earlier than setup.
121      m_pMessages   = NULL;      m_pMessages = NULL;
122        m_pInstrumentListForm = NULL;
123      m_pDeviceForm = NULL;      m_pDeviceForm = NULL;
124    
125      // We'll start clean.      // We'll start clean.
# Line 188  void qsamplerMainForm::destroy (void) Line 196  void qsamplerMainForm::destroy (void)
196      // Finally drop any widgets around...      // Finally drop any widgets around...
197      if (m_pDeviceForm)      if (m_pDeviceForm)
198          delete m_pDeviceForm;          delete m_pDeviceForm;
199        if (m_pInstrumentListForm)
200            delete m_pInstrumentListForm;
201      if (m_pMessages)      if (m_pMessages)
202          delete m_pMessages;          delete m_pMessages;
203      if (m_pWorkspace)      if (m_pWorkspace)
# Line 206  void qsamplerMainForm::destroy (void) Line 216  void qsamplerMainForm::destroy (void)
216      // Delete recentfiles menu.      // Delete recentfiles menu.
217      if (m_pRecentFilesMenu)      if (m_pRecentFilesMenu)
218          delete m_pRecentFilesMenu;          delete m_pRecentFilesMenu;
219    
220            // Pseudo-singleton reference shut-down.
221            g_pMainForm = NULL;
222  }  }
223    
224    
# Line 216  void qsamplerMainForm::setup ( qsamplerO Line 229  void qsamplerMainForm::setup ( qsamplerO
229      m_pOptions = pOptions;      m_pOptions = pOptions;
230    
231      // What style do we create these forms?      // What style do we create these forms?
232      WFlags wflags = Qt::WType_TopLevel;          Qt::WFlags wflags = Qt::WStyle_Customize
233                    | Qt::WStyle_NormalBorder
234                    | Qt::WStyle_Title
235                    | Qt::WStyle_SysMenu
236                    | Qt::WStyle_MinMax
237                    | Qt::WType_TopLevel;
238      if (m_pOptions->bKeepOnTop)      if (m_pOptions->bKeepOnTop)
239          wflags |= Qt::WStyle_Tool;          wflags |= Qt::WStyle_Tool;
240      // Some child forms are to be created right now.      // Some child forms are to be created right now.
241      m_pMessages = new qsamplerMessages(this);      m_pMessages = new qsamplerMessages(this);
242      m_pDeviceForm = new qsamplerDeviceForm(this, 0, wflags);      m_pDeviceForm = new qsamplerDeviceForm(this, 0, wflags);
243      m_pDeviceForm->setMainForm(this); // An important life immutable!  #ifdef CONFIG_MIDI_INSTRUMENT
244        m_pInstrumentListForm = new qsamplerInstrumentListForm(this, 0, wflags);
245            QObject::connect(m_pInstrumentListForm->InstrumentList,
246                    SIGNAL(instrumentsChanged()),
247                    SLOT(sessionDirty()));
248    #else
249            viewInstrumentsAction->setEnabled(false);
250    #endif
251      // Set message defaults...      // Set message defaults...
252      updateMessagesFont();      updateMessagesFont();
253      updateMessagesLimit();      updateMessagesLimit();
254      updateMessagesCapture();      updateMessagesCapture();
255      // Set the visibility signal.      // Set the visibility signal.
256      QObject::connect(m_pMessages, SIGNAL(visibilityChanged(bool)), this, SLOT(stabilizeForm()));      QObject::connect(m_pMessages,
257                    SIGNAL(visibilityChanged(bool)),
258                    SLOT(stabilizeForm()));
259    
260      // Initial decorations toggle state.      // Initial decorations toggle state.
261      viewMenubarAction->setOn(m_pOptions->bMenubar);      viewMenubarAction->setOn(m_pOptions->bMenubar);
# Line 253  void qsamplerMainForm::setup ( qsamplerO Line 280  void qsamplerMainForm::setup ( qsamplerO
280      }      }
281      // Try to restore old window positioning and initial visibility.      // Try to restore old window positioning and initial visibility.
282      m_pOptions->loadWidgetGeometry(this);      m_pOptions->loadWidgetGeometry(this);
283        m_pOptions->loadWidgetGeometry(m_pInstrumentListForm);
284      m_pOptions->loadWidgetGeometry(m_pDeviceForm);      m_pOptions->loadWidgetGeometry(m_pDeviceForm);
285    
286      // Final startup stabilization...      // Final startup stabilization...
# Line 293  bool qsamplerMainForm::queryClose (void) Line 321  bool qsamplerMainForm::queryClose (void)
321              m_pOptions->settings().writeEntry("/Layout/DockWindows", sDockables);              m_pOptions->settings().writeEntry("/Layout/DockWindows", sDockables);
322              // And the children, and the main windows state,.              // And the children, and the main windows state,.
323                          m_pOptions->saveWidgetGeometry(m_pDeviceForm);                          m_pOptions->saveWidgetGeometry(m_pDeviceForm);
324                            m_pOptions->saveWidgetGeometry(m_pInstrumentListForm);
325                          m_pOptions->saveWidgetGeometry(this);                          m_pOptions->saveWidgetGeometry(this);
326                          // Close popup widgets.                          // Close popup widgets.
327                            if (m_pInstrumentListForm)
328                                    m_pInstrumentListForm->close();
329                          if (m_pDeviceForm)                          if (m_pDeviceForm)
330                                  m_pDeviceForm->close();                                  m_pDeviceForm->close();
331              // Stop client and/or server, gracefully.              // Stop client and/or server, gracefully.
# Line 353  void qsamplerMainForm::dropEvent ( QDrop Line 384  void qsamplerMainForm::dropEvent ( QDrop
384                  const QString& sPath = *iter;                  const QString& sPath = *iter;
385                  if (qsamplerChannel::isInstrumentFile(sPath)) {                  if (qsamplerChannel::isInstrumentFile(sPath)) {
386                          // Try to create a new channel from instrument file...                          // Try to create a new channel from instrument file...
387                          qsamplerChannel *pChannel = new qsamplerChannel(this);                          qsamplerChannel *pChannel = new qsamplerChannel();
388                          if (pChannel == NULL)                          if (pChannel == NULL)
389                                  return;                                  return;
390                          // Start setting the instrument filename...                          // Start setting the instrument filename...
# Line 373  void qsamplerMainForm::dropEvent ( QDrop Line 404  void qsamplerMainForm::dropEvent ( QDrop
404                          m_iDirtyCount++;                          m_iDirtyCount++;
405                          stabilizeForm();                          stabilizeForm();
406                  }   // Otherwise, load an usual session file (LSCP script)...                  }   // Otherwise, load an usual session file (LSCP script)...
407                  else if (closeSession(true))                  else if (closeSession(true)) {
408                          loadSessionFile(sPath);                          loadSessionFile(sPath);
409                            break;
410                    }
411                  // Make it look responsive...:)                  // Make it look responsive...:)
412                  QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);                  QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
413          }          }
# Line 387  void qsamplerMainForm::customEvent ( QCu Line 420  void qsamplerMainForm::customEvent ( QCu
420      // For the time being, just pump it to messages.      // For the time being, just pump it to messages.
421      if (pCustomEvent->type() == QSAMPLER_CUSTOM_EVENT) {      if (pCustomEvent->type() == QSAMPLER_CUSTOM_EVENT) {
422          qsamplerCustomEvent *pEvent = (qsamplerCustomEvent *) pCustomEvent;          qsamplerCustomEvent *pEvent = (qsamplerCustomEvent *) pCustomEvent;
423          appendMessagesColor(tr("Notify event: %1 data: %2")                  if (pEvent->event() == LSCP_EVENT_CHANNEL_INFO) {
424              .arg(::lscp_event_to_text(pEvent->event()))                          int iChannelID = pEvent->data().toInt();
425              .arg(pEvent->data()), "#996699");                          qsamplerChannelStrip *pChannelStrip = channelStrip(iChannelID);
426                            if (pChannelStrip)
427                                    channelStripChanged(pChannelStrip);
428                    } else {
429                            appendMessagesColor(tr("Notify event: %1 data: %2")
430                                    .arg(::lscp_event_to_text(pEvent->event()))
431                                    .arg(pEvent->data()), "#996699");
432                    }
433      }      }
434  }  }
435    
# Line 412  qsamplerOptions *qsamplerMainForm::optio Line 452  qsamplerOptions *qsamplerMainForm::optio
452      return m_pOptions;      return m_pOptions;
453  }  }
454    
455    
456  // The LSCP client descriptor property.  // The LSCP client descriptor property.
457  lscp_client_t *qsamplerMainForm::client (void)  lscp_client_t *qsamplerMainForm::client (void)
458  {  {
# Line 419  lscp_client_t *qsamplerMainForm::client Line 460  lscp_client_t *qsamplerMainForm::client
460  }  }
461    
462    
463    // The pseudo-singleton instance accessor.
464    qsamplerMainForm *qsamplerMainForm::getInstance (void)
465    {
466            return g_pMainForm;
467    }
468    
469    
470  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
471  // qsamplerMainForm -- Session file stuff.  // qsamplerMainForm -- Session file stuff.
472    
# Line 466  bool qsamplerMainForm::openSession (void Line 514  bool qsamplerMainForm::openSession (void
514    
515      // Ask for the filename to open...      // Ask for the filename to open...
516      QString sFilename = QFileDialog::getOpenFileName(      QString sFilename = QFileDialog::getOpenFileName(
517              m_pOptions->sSessionDir,                // Start here.                  m_pOptions->sSessionDir,                // Start here.
518              tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)                  tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
519              this, 0,                                // Parent and name (none)                  this, 0,                                // Parent and name (none)
520              tr("Open Session")                      // Caption.                  QSAMPLER_TITLE ": " + tr("Open Session")        // Caption.
521      );      );
522    
523      // Have we cancelled?      // Have we cancelled?
# Line 500  bool qsamplerMainForm::saveSession ( boo Line 548  bool qsamplerMainForm::saveSession ( boo
548              sFilename = m_pOptions->sSessionDir;              sFilename = m_pOptions->sSessionDir;
549          // Prompt the guy...          // Prompt the guy...
550          sFilename = QFileDialog::getSaveFileName(          sFilename = QFileDialog::getSaveFileName(
551                  sFilename,                              // Start here.                          sFilename,                              // Start here.
552                  tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)                          tr("LSCP Session files") + " (*.lscp)", // Filter (LSCP files)
553                  this, 0,                                // Parent and name (none)                          this, 0,                                // Parent and name (none)
554                  tr("Save Session")                      // Caption.                          QSAMPLER_TITLE ": " + tr("Save Session")        // Caption.
555          );          );
556          // Have we cancelled it?          // Have we cancelled it?
557          if (sFilename.isEmpty())          if (sFilename.isEmpty())
# Line 513  bool qsamplerMainForm::saveSession ( boo Line 561  bool qsamplerMainForm::saveSession ( boo
561              sFilename += ".lscp";              sFilename += ".lscp";
562          // Check if already exists...          // Check if already exists...
563          if (sFilename != m_sFilename && QFileInfo(sFilename).exists()) {          if (sFilename != m_sFilename && QFileInfo(sFilename).exists()) {
564              if (QMessageBox::warning(this, tr("Warning"),              if (QMessageBox::warning(this,
565                                    QSAMPLER_TITLE ": " + tr("Warning"),
566                  tr("The file already exists:\n\n"                  tr("The file already exists:\n\n"
567                     "\"%1\"\n\n"                     "\"%1\"\n\n"
568                     "Do you want to replace it?")                     "Do you want to replace it?")
# Line 535  bool qsamplerMainForm::closeSession ( bo Line 584  bool qsamplerMainForm::closeSession ( bo
584    
585      // Are we dirty enough to prompt it?      // Are we dirty enough to prompt it?
586      if (m_iDirtyCount > 0) {      if (m_iDirtyCount > 0) {
587          switch (QMessageBox::warning(this, tr("Warning"),          switch (QMessageBox::warning(this,
588                            QSAMPLER_TITLE ": " + tr("Warning"),
589              tr("The current session has been changed:\n\n"              tr("The current session has been changed:\n\n"
590              "\"%1\"\n\n"              "\"%1\"\n\n"
591              "Do you want to save the changes?")              "Do you want to save the changes?")
# Line 588  bool qsamplerMainForm::loadSessionFile ( Line 638  bool qsamplerMainForm::loadSessionFile (
638          return false;          return false;
639      }      }
640    
641            // Tell the world we'll take some time...
642            QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
643    
644      // Read the file.      // Read the file.
645            int iLine = 0;
646      int iErrors = 0;      int iErrors = 0;
647      QTextStream ts(&file);      QTextStream ts(&file);
648      while (!ts.atEnd()) {      while (!ts.atEnd()) {
649          // Read the line.          // Read the line.
650          QString sCommand = ts.readLine().simplifyWhiteSpace();          QString sCommand = ts.readLine().stripWhiteSpace();
651                    iLine++;
652          // If not empty, nor a comment, call the server...          // If not empty, nor a comment, call the server...
653          if (!sCommand.isEmpty() && sCommand[0] != '#') {          if (!sCommand.isEmpty() && sCommand[0] != '#') {
654              appendMessagesColor(sCommand, "#996633");                          // Remember that, no matter what,
655              // Remember that, no matter what,                          // all LSCP commands are CR/LF terminated.
656              // all LSCP commands are CR/LF terminated.                          sCommand += "\r\n";
657              sCommand += "\r\n";                          if (::lscp_client_query(m_pClient, sCommand.latin1()) != LSCP_OK) {
658              if (::lscp_client_query(m_pClient, sCommand.latin1()) != LSCP_OK) {                                  appendMessagesColor(QString("%1(%2): %3")
659                  appendMessagesClient("lscp_client_query");                                          .arg(QFileInfo(sFilename).fileName()).arg(iLine)
660                  iErrors++;                                          .arg(sCommand.simplifyWhiteSpace()), "#996633");
661              }                                  appendMessagesClient("lscp_client_query");
662                                    iErrors++;
663                            }
664          }          }
665          // Try to make it snappy :)          // Try to make it snappy :)
666          QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);          QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
# Line 615  bool qsamplerMainForm::loadSessionFile ( Line 672  bool qsamplerMainForm::loadSessionFile (
672          // Now we'll try to create (update) the whole GUI session.          // Now we'll try to create (update) the whole GUI session.
673          updateSession();          updateSession();
674    
675            // We're fornerly done.
676            QApplication::restoreOverrideCursor();
677    
678          // Have we any errors?          // Have we any errors?
679          if (iErrors > 0)          if (iErrors > 0)
680                  appendMessagesError(tr("Session loaded with errors\nfrom \"%1\".\n\nSorry.").arg(sFilename));                  appendMessagesError(tr("Session loaded with errors\nfrom \"%1\".\n\nSorry.").arg(sFilename));
# Line 638  bool qsamplerMainForm::loadSessionFile ( Line 698  bool qsamplerMainForm::loadSessionFile (
698  // Save current session to specific file path.  // Save current session to specific file path.
699  bool qsamplerMainForm::saveSessionFile ( const QString& sFilename )  bool qsamplerMainForm::saveSessionFile ( const QString& sFilename )
700  {  {
701            if (m_pClient == NULL)
702                    return false;
703    
704            // Check whether server is apparently OK...
705            if (::lscp_get_channels(m_pClient) < 0) {
706                    appendMessagesClient("lscp_get_channels");
707                    return false;
708            }
709    
710      // Open and write into real file.      // Open and write into real file.
711      QFile file(sFilename);      QFile file(sFilename);
712      if (!file.open(IO_WriteOnly | IO_Truncate)) {      if (!file.open(IO_WriteOnly | IO_Truncate)) {
# Line 645  bool qsamplerMainForm::saveSessionFile ( Line 714  bool qsamplerMainForm::saveSessionFile (
714          return false;          return false;
715      }      }
716    
717            // Tell the world we'll take some time...
718            QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
719    
720      // Write the file.      // Write the file.
721      int  iErrors = 0;      int  iErrors = 0;
722      QTextStream ts(&file);      QTextStream ts(&file);
# Line 661  bool qsamplerMainForm::saveSessionFile ( Line 733  bool qsamplerMainForm::saveSessionFile (
733         << " "  << QTime::currentTime().toString("hh:mm:ss") << endl;         << " "  << QTime::currentTime().toString("hh:mm:ss") << endl;
734      ts << "#"  << endl;      ts << "#"  << endl;
735      ts << endl;      ts << endl;
736    
737          // It is assumed that this new kind of device+session file          // It is assumed that this new kind of device+session file
738          // will be loaded from a complete          // will be loaded from a complete initialized server...
739          int *piDeviceIDs;          int *piDeviceIDs;
740          int  iDevice;          int  iDevice;
741          ts << "RESET" << endl;          ts << "RESET" << endl;
742    
743          // Audio device mapping.          // Audio device mapping.
744          QMap<int, int> audioDeviceMap;          QMap<int, int> audioDeviceMap;
745          piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Audio);          piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Audio);
746          for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {          for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
747                  ts << endl;                  ts << endl;
748                  qsamplerDevice device(this, qsamplerDevice::Audio, piDeviceIDs[iDevice]);                  qsamplerDevice device(qsamplerDevice::Audio, piDeviceIDs[iDevice]);
749                  // Audio device specification...                  // Audio device specification...
750                  ts << "# " << device.deviceTypeName() << " " << device.driverName()                  ts << "# " << device.deviceTypeName() << " " << device.driverName()
751                          << " " << tr("Device") << " " << iDevice << endl;                          << " " << tr("Device") << " " << iDevice << endl;
# Line 703  bool qsamplerMainForm::saveSessionFile ( Line 777  bool qsamplerMainForm::saveSessionFile (
777                  }                  }
778                  // Audio device index/id mapping.                  // Audio device index/id mapping.
779                  audioDeviceMap[device.deviceID()] = iDevice;                  audioDeviceMap[device.deviceID()] = iDevice;
780          // Try to keep it snappy :)                  // Try to keep it snappy :)
781          QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);                  QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
782          }          }
783    
784          // MIDI device mapping.          // MIDI device mapping.
785          QMap<int, int> midiDeviceMap;          QMap<int, int> midiDeviceMap;
786          piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Midi);          piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Midi);
787          for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {          for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
788                  ts << endl;                  ts << endl;
789                  qsamplerDevice device(this, qsamplerDevice::Midi, piDeviceIDs[iDevice]);                  qsamplerDevice device(qsamplerDevice::Midi, piDeviceIDs[iDevice]);
790                  // MIDI device specification...                  // MIDI device specification...
791                  ts << "# " << device.deviceTypeName() << " " << device.driverName()                  ts << "# " << device.deviceTypeName() << " " << device.driverName()
792                          << " " << tr("Device") << " " << iDevice << endl;                          << " " << tr("Device") << " " << iDevice << endl;
# Line 743  bool qsamplerMainForm::saveSessionFile ( Line 818  bool qsamplerMainForm::saveSessionFile (
818                  }                  }
819                  // MIDI device index/id mapping.                  // MIDI device index/id mapping.
820                  midiDeviceMap[device.deviceID()] = iDevice;                  midiDeviceMap[device.deviceID()] = iDevice;
821          // Try to keep it snappy :)                  // Try to keep it snappy :)
822          QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);                  QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
823          }          }
824          ts << endl;          ts << endl;
825    
826    #ifdef CONFIG_MIDI_INSTRUMENT
827            // MIDI instrument mapping...
828            QMap<int, int> midiInstrumentMap;
829            int *piMaps = ::lscp_list_midi_instrument_maps(m_pClient);
830            for (int iMap = 0; piMaps && piMaps[iMap] >= 0; iMap++) {
831                    int iMidiMap = piMaps[iMap];
832                    const char *pszMapName
833                            = ::lscp_get_midi_instrument_map_name(m_pClient, iMidiMap);
834                    ts << "# " << tr("MIDI instrument map") << " " << iMap;
835                    if (pszMapName)
836                            ts << " - " << pszMapName;
837                    ts << endl;
838                    ts << "ADD MIDI_INSTRUMENT_MAP";
839                    if (pszMapName)
840                            ts << " '" << pszMapName << "'";
841                    ts << endl;
842                    // MIDI instrument mapping...
843                    lscp_midi_instrument_t *pInstrs
844                            = ::lscp_list_midi_instruments(m_pClient, iMidiMap);
845                    for (int iInstr = 0; pInstrs && pInstrs[iInstr].map >= 0; iInstr++) {
846                            lscp_midi_instrument_info_t *pInstrInfo
847                                    = ::lscp_get_midi_instrument_info(m_pClient, &pInstrs[iInstr]);
848                            if (pInstrInfo) {
849                                    ts << "MAP MIDI_INSTRUMENT "
850                                            << iMap                        << " "
851                                            << pInstrs[iInstr].bank        << " "
852                                            << pInstrs[iInstr].prog        << " "
853                                            << pInstrInfo->engine_name     << " '"
854                                            << pInstrInfo->instrument_file << "' "
855                                            << pInstrInfo->instrument_nr   << " "
856                                            << pInstrInfo->volume          << " ";
857                                    switch (pInstrInfo->load_mode) {
858                                            case LSCP_LOAD_PERSISTENT:
859                                                    ts << "PERSISTENT";
860                                                    break;
861                                            case LSCP_LOAD_ON_DEMAND_HOLD:
862                                                    ts << "ON_DEMAND_HOLD";
863                                                    break;
864                                            case LSCP_LOAD_ON_DEMAND:
865                                            case LSCP_LOAD_DEFAULT:
866                                            default:
867                                                    ts << "ON_DEMAND";
868                                                    break;
869                                    }
870                                    if (pInstrInfo->name)
871                                            ts << " '" << pInstrInfo->name << "'";
872                                    ts << endl;
873                            }       // Check for errors...
874                            else if (::lscp_client_get_errno(m_pClient)) {
875                                    appendMessagesClient("lscp_get_midi_instrument_info");
876                                    iErrors++;
877                            }
878                            // Try to keep it snappy :)
879                            QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
880                    }
881                    ts << endl;
882                    // Check for errors...
883                    if (pInstrs == NULL && ::lscp_client_get_errno(m_pClient)) {
884                            appendMessagesClient("lscp_list_midi_instruments");
885                            iErrors++;
886                    }
887                    // MIDI strument index/id mapping.
888                    midiInstrumentMap[iMidiMap] = iMap;
889            }
890            // Check for errors...
891            if (piMaps == NULL && ::lscp_client_get_errno(m_pClient)) {
892                    appendMessagesClient("lscp_list_midi_instrument_maps");
893                    iErrors++;
894            }
895    #endif  // CONFIG_MIDI_INSTRUMENT
896    
897          // Sampler channel mapping.          // Sampler channel mapping.
898      QWidgetList wlist = m_pWorkspace->windowList();      QWidgetList wlist = m_pWorkspace->windowList();
899      for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {      for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
# Line 779  bool qsamplerMainForm::saveSessionFile ( Line 926  bool qsamplerMainForm::saveSessionFile (
926                      ts << pChannel->midiChannel();                      ts << pChannel->midiChannel();
927                  ts << endl;                  ts << endl;
928                  ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannel << endl;                  ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannel << endl;
929                  ts << "LOAD INSTRUMENT NON_MODAL '" << pChannel->instrumentFile() << "' " << pChannel->instrumentNr() << " " << iChannel << endl;                                  if (pChannel->instrumentStatus() < 100) ts << "# ";
930                  ts << "SET CHANNEL VOLUME " << iChannel << " " << pChannel->volume() << endl;                                  ts << "LOAD INSTRUMENT NON_MODAL '" << pChannel->instrumentFile() << "' "
931                                            << pChannel->instrumentNr() << " " << iChannel << endl;
932                                    qsamplerChannelRoutingMap::ConstIterator audioRoute;
933                                    for (audioRoute = pChannel->audioRouting().begin();
934                                                    audioRoute != pChannel->audioRouting().end();
935                                                            ++audioRoute) {
936                                            ts << "SET CHANNEL AUDIO_OUTPUT_CHANNEL " << iChannel
937                                                    << " " << audioRoute.key()
938                                                    << " " << audioRoute.data() << endl;
939                                    }
940                                    ts << "SET CHANNEL VOLUME " << iChannel
941                                            << " " << pChannel->volume() << endl;
942                                    if (pChannel->channelMute())
943                                            ts << "SET CHANNEL MUTE " << iChannel << " 1" << endl;
944                                    if (pChannel->channelSolo())
945                                            ts << "SET CHANNEL SOLO " << iChannel << " 1" << endl;
946    #ifdef CONFIG_MIDI_INSTRUMENT
947                                    if (pChannel->midiMap() >= 0) {
948                                            ts << "SET CHANNEL MIDI_INSTRUMENT_MAP " << iChannel
949                                                    << " " << midiInstrumentMap[pChannel->midiMap()] << endl;
950                                    }
951    #endif
952                  ts << endl;                  ts << endl;
953              }              }
954          }          }
# Line 791  bool qsamplerMainForm::saveSessionFile ( Line 959  bool qsamplerMainForm::saveSessionFile (
959      // Ok. we've wrote it.      // Ok. we've wrote it.
960      file.close();      file.close();
961    
962            // We're fornerly done.
963            QApplication::restoreOverrideCursor();
964    
965      // Have we any errors?      // Have we any errors?
966      if (iErrors > 0)      if (iErrors > 0)
967          appendMessagesError(tr("Some settings could not be saved\nto \"%1\" session file.\n\nSorry.").arg(sFilename));          appendMessagesError(tr("Some settings could not be saved\nto \"%1\" session file.\n\nSorry.").arg(sFilename));
# Line 872  void qsamplerMainForm::fileReset (void) Line 1043  void qsamplerMainForm::fileReset (void)
1043          return;          return;
1044    
1045      // Ask user whether he/she want's an internal sampler reset...      // Ask user whether he/she want's an internal sampler reset...
1046      if (QMessageBox::warning(this, tr("Warning"),      if (QMessageBox::warning(this,
1047                    QSAMPLER_TITLE ": " + tr("Warning"),
1048          tr("Resetting the sampler instance will close\n"          tr("Resetting the sampler instance will close\n"
1049             "all device and channel configurations.\n\n"             "all device and channel configurations.\n\n"
1050             "Please note that this operation may cause\n"             "Please note that this operation may cause\n"
# Line 881  void qsamplerMainForm::fileReset (void) Line 1053  void qsamplerMainForm::fileReset (void)
1053          tr("Reset"), tr("Cancel")) > 0)          tr("Reset"), tr("Cancel")) > 0)
1054          return;          return;
1055    
1056            // Trye closing the current session, first...
1057            if (!closeSession(true))
1058                    return;
1059    
1060      // Just do the reset, after closing down current session...      // Just do the reset, after closing down current session...
1061      if (closeSession(true) && ::lscp_reset_sampler(m_pClient) != LSCP_OK) {          // Do the actual sampler reset...
1062          appendMessagesClient("lscp_reset_sampler");          if (::lscp_reset_sampler(m_pClient) != LSCP_OK) {
1063          appendMessagesError(tr("Could not reset sampler instance.\n\nSorry."));                  appendMessagesClient("lscp_reset_sampler");
1064          return;                  appendMessagesError(tr("Could not reset sampler instance.\n\nSorry."));
1065      }                  return;
1066            }
1067    
1068      // Log this.      // Log this.
1069      appendMessages(tr("Sampler reset."));      appendMessages(tr("Sampler reset."));
# Line 907  void qsamplerMainForm::fileRestart (void Line 1084  void qsamplerMainForm::fileRestart (void
1084      // Ask user whether he/she want's a complete restart...      // Ask user whether he/she want's a complete restart...
1085      // (if we're currently up and running)      // (if we're currently up and running)
1086      if (bRestart && m_pClient) {      if (bRestart && m_pClient) {
1087          bRestart = (QMessageBox::warning(this, tr("Warning"),          bRestart = (QMessageBox::warning(this,
1088                            QSAMPLER_TITLE ": " + tr("Warning"),
1089              tr("New settings will be effective after\n"              tr("New settings will be effective after\n"
1090                 "restarting the client/server connection.\n\n"                 "restarting the client/server connection.\n\n"
1091                 "Please note that this operation may cause\n"                 "Please note that this operation may cause\n"
# Line 944  void qsamplerMainForm::editAddChannel (v Line 1122  void qsamplerMainForm::editAddChannel (v
1122          return;          return;
1123    
1124      // Just create the channel instance...      // Just create the channel instance...
1125      qsamplerChannel *pChannel = new qsamplerChannel(this);      qsamplerChannel *pChannel = new qsamplerChannel();
1126      if (pChannel == NULL)      if (pChannel == NULL)
1127          return;          return;
1128    
# Line 983  void qsamplerMainForm::editRemoveChannel Line 1161  void qsamplerMainForm::editRemoveChannel
1161    
1162      // Prompt user if he/she's sure about this...      // Prompt user if he/she's sure about this...
1163      if (m_pOptions && m_pOptions->bConfirmRemove) {      if (m_pOptions && m_pOptions->bConfirmRemove) {
1164          if (QMessageBox::warning(this, tr("Warning"),          if (QMessageBox::warning(this,
1165                            QSAMPLER_TITLE ": " + tr("Warning"),
1166              tr("About to remove channel:\n\n"              tr("About to remove channel:\n\n"
1167                 "%1\n\n"                 "%1\n\n"
1168                 "Are you sure?")                 "Are you sure?")
# Line 1106  void qsamplerMainForm::viewMessages ( bo Line 1285  void qsamplerMainForm::viewMessages ( bo
1285  }  }
1286    
1287    
1288    // Show/hide the MIDI instrument list-view form.
1289    void qsamplerMainForm::viewInstruments (void)
1290    {
1291            if (m_pOptions == NULL)
1292                    return;
1293    
1294            if (m_pInstrumentListForm) {
1295                    m_pOptions->saveWidgetGeometry(m_pInstrumentListForm);
1296                    if (m_pInstrumentListForm->isVisible()) {
1297                            m_pInstrumentListForm->hide();
1298                    } else {
1299                            m_pInstrumentListForm->show();
1300                            m_pInstrumentListForm->raise();
1301                            m_pInstrumentListForm->setActiveWindow();
1302                    }
1303            }
1304    }
1305    
1306    
1307  // Show/hide the device configurator form.  // Show/hide the device configurator form.
1308  void qsamplerMainForm::viewDevices (void)  void qsamplerMainForm::viewDevices (void)
1309  {  {
# Line 1114  void qsamplerMainForm::viewDevices (void Line 1312  void qsamplerMainForm::viewDevices (void
1312    
1313          if (m_pDeviceForm) {          if (m_pDeviceForm) {
1314                  m_pOptions->saveWidgetGeometry(m_pDeviceForm);                  m_pOptions->saveWidgetGeometry(m_pDeviceForm);
                 m_pDeviceForm->setClient(m_pClient);  
1315                  if (m_pDeviceForm->isVisible()) {                  if (m_pDeviceForm->isVisible()) {
1316                          m_pDeviceForm->hide();                          m_pDeviceForm->hide();
1317                  } else {                  } else {
# Line 1166  void qsamplerMainForm::viewOptions (void Line 1363  void qsamplerMainForm::viewOptions (void
1363                  (!bOldStdoutCapture &&  m_pOptions->bStdoutCapture) ||                  (!bOldStdoutCapture &&  m_pOptions->bStdoutCapture) ||
1364                  ( bOldKeepOnTop     && !m_pOptions->bKeepOnTop)     ||                  ( bOldKeepOnTop     && !m_pOptions->bKeepOnTop)     ||
1365                  (!bOldKeepOnTop     &&  m_pOptions->bKeepOnTop)) {                  (!bOldKeepOnTop     &&  m_pOptions->bKeepOnTop)) {
1366                  QMessageBox::information(this, tr("Information"),                  QMessageBox::information(this,
1367                                            QSAMPLER_TITLE ": " + tr("Information"),
1368                      tr("Some settings may be only effective\n"                      tr("Some settings may be only effective\n"
1369                         "next time you start this program."), tr("OK"));                         "next time you start this program."), tr("OK"));
1370                  updateMessagesCapture();                  updateMessagesCapture();
# Line 1294  void qsamplerMainForm::helpAbout (void) Line 1492  void qsamplerMainForm::helpAbout (void)
1492      sText += tr("LSCP (liblscp) instrument_name support disabled.");      sText += tr("LSCP (liblscp) instrument_name support disabled.");
1493      sText += "</font></small><br />";      sText += "</font></small><br />";
1494  #endif  #endif
1495    #ifndef CONFIG_MUTE_SOLO
1496        sText += "<small><font color=\"red\">";
1497        sText += tr("Sampler channel Mute/Solo support disabled.");
1498        sText += "</font></small><br />";
1499    #endif
1500    #ifndef CONFIG_MIDI_INSTRUMENT
1501        sText += "<small><font color=\"red\">";
1502        sText += tr("MIDI instrument mapping support disabled.");
1503        sText += "</font></small><br />";
1504    #endif
1505      sText += "<br />\n";      sText += "<br />\n";
1506      sText += tr("Using") + ": ";      sText += tr("Using") + ": ";
1507      sText += ::lscp_client_package();      sText += ::lscp_client_package();
# Line 1301  void qsamplerMainForm::helpAbout (void) Line 1509  void qsamplerMainForm::helpAbout (void)
1509      sText += ::lscp_client_version();      sText += ::lscp_client_version();
1510  #ifdef CONFIG_LIBGIG  #ifdef CONFIG_LIBGIG
1511      sText += ", ";      sText += ", ";
1512      sText += gig::libraryName();      sText += gig::libraryName().c_str();
1513      sText += " ";      sText += " ";
1514      sText += gig::libraryVersion();      sText += gig::libraryVersion().c_str();
1515  #endif  #endif
1516      sText += "<br />\n";      sText += "<br />\n";
1517      sText += "<br />\n";      sText += "<br />\n";
# Line 1329  void qsamplerMainForm::stabilizeForm (vo Line 1537  void qsamplerMainForm::stabilizeForm (vo
1537      // Update the main application caption...      // Update the main application caption...
1538      QString sSessionName = sessionName(m_sFilename);      QString sSessionName = sessionName(m_sFilename);
1539      if (m_iDirtyCount > 0)      if (m_iDirtyCount > 0)
1540          sSessionName += '*';          sSessionName += " *";
1541      setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessionName));      setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessionName));
1542    
1543      // Update the main menu state...      // Update the main menu state...
# Line 1348  void qsamplerMainForm::stabilizeForm (vo Line 1556  void qsamplerMainForm::stabilizeForm (vo
1556      editResetChannelAction->setEnabled(bHasChannel);      editResetChannelAction->setEnabled(bHasChannel);
1557      editResetAllChannelsAction->setEnabled(bHasChannel);      editResetAllChannelsAction->setEnabled(bHasChannel);
1558      viewMessagesAction->setOn(m_pMessages && m_pMessages->isVisible());      viewMessagesAction->setOn(m_pMessages && m_pMessages->isVisible());
1559      viewDevicesAction->setOn(m_pDeviceForm && m_pDeviceForm->isVisible());  #ifdef CONFIG_MIDI_INSTRUMENT
1560            viewInstrumentsAction->setOn(m_pInstrumentListForm
1561                    && m_pInstrumentListForm->isVisible());
1562            viewInstrumentsAction->setEnabled(bHasClient);
1563    #endif
1564            viewDevicesAction->setOn(m_pDeviceForm
1565                    && m_pDeviceForm->isVisible());
1566      viewDevicesAction->setEnabled(bHasClient);      viewDevicesAction->setEnabled(bHasClient);
1567      channelsArrangeAction->setEnabled(bHasChannel);      channelsArrangeAction->setEnabled(bHasChannel);
1568    
# Line 1399  void qsamplerMainForm::channelStripChang Line 1613  void qsamplerMainForm::channelStripChang
1613  // Grab and restore current sampler channels session.  // Grab and restore current sampler channels session.
1614  void qsamplerMainForm::updateSession (void)  void qsamplerMainForm::updateSession (void)
1615  {  {
1616    #ifdef CONFIG_MIDI_INSTRUMENT
1617            // FIXME: Make some room for default instrument maps...
1618            int iMaps = ::lscp_get_midi_instrument_maps(m_pClient);
1619            if (iMaps < 0)
1620                    appendMessagesClient("lscp_get_midi_instrument_maps");
1621            else if (iMaps < 1) {
1622                    ::lscp_add_midi_instrument_map(m_pClient, tr("Chromatic").latin1());
1623                    ::lscp_add_midi_instrument_map(m_pClient, tr("Drum Kits").latin1());
1624            }
1625    #endif
1626    
1627          // Retrieve the current channel list.          // Retrieve the current channel list.
1628          int *piChannelIDs = ::lscp_list_channels(m_pClient);          int *piChannelIDs = ::lscp_list_channels(m_pClient);
1629          if (piChannelIDs == NULL) {          if (piChannelIDs == NULL) {
# Line 1406  void qsamplerMainForm::updateSession (vo Line 1631  void qsamplerMainForm::updateSession (vo
1631                          appendMessagesClient("lscp_list_channels");                          appendMessagesClient("lscp_list_channels");
1632                          appendMessagesError(tr("Could not get current list of channels.\n\nSorry."));                          appendMessagesError(tr("Could not get current list of channels.\n\nSorry."));
1633                  }                  }
1634                  return;          } else {
1635                    // Try to (re)create each channel.
1636                    m_pWorkspace->setUpdatesEnabled(false);
1637                    for (int iChannel = 0; piChannelIDs[iChannel] >= 0; iChannel++) {
1638                            // Check if theres already a channel strip for this one...
1639                            if (!channelStrip(piChannelIDs[iChannel]))
1640                                    createChannelStrip(new qsamplerChannel(piChannelIDs[iChannel]));
1641                    }
1642                    m_pWorkspace->setUpdatesEnabled(true);
1643          }          }
1644    
1645          // Try to (re)create each channel.      // Do we auto-arrange?
1646          m_pWorkspace->setUpdatesEnabled(false);      if (m_pOptions && m_pOptions->bAutoArrange)
1647          for (int iChannel = 0; piChannelIDs[iChannel] >= 0; iChannel++) {          channelsArrange();
1648                  // Check if theres already a channel strip for this one...  
1649                  if (!channelStrip(piChannelIDs[iChannel]))          // Remember to refresh devices and instruments...
1650                          createChannelStrip(new qsamplerChannel(this, piChannelIDs[iChannel]));          if (m_pInstrumentListForm)
1651                  // Make it visibly responsive...              m_pInstrumentListForm->refreshInstruments();
                 QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);  
         }  
         m_pWorkspace->setUpdatesEnabled(true);  
           
         // Remember to refresh devices  
1652          if (m_pDeviceForm)          if (m_pDeviceForm)
1653              m_pDeviceForm->refreshDevices();              m_pDeviceForm->refreshDevices();
1654  }  }
# Line 1593  void qsamplerMainForm::appendMessagesErr Line 1821  void qsamplerMainForm::appendMessagesErr
1821    
1822      appendMessagesColor(s.simplifyWhiteSpace(), "#ff0000");      appendMessagesColor(s.simplifyWhiteSpace(), "#ff0000");
1823    
1824      QMessageBox::critical(this, tr("Error"), s, tr("Cancel"));          // Make it look responsive...:)
1825            QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
1826    
1827        QMessageBox::critical(this,
1828                    QSAMPLER_TITLE ": " + tr("Error"), s, tr("Cancel"));
1829  }  }
1830    
1831    
# Line 1606  void qsamplerMainForm::appendMessagesCli Line 1838  void qsamplerMainForm::appendMessagesCli
1838      appendMessagesColor(s + QString(": %1 (errno=%2)")      appendMessagesColor(s + QString(": %1 (errno=%2)")
1839          .arg(::lscp_client_get_result(m_pClient))          .arg(::lscp_client_get_result(m_pClient))
1840          .arg(::lscp_client_get_errno(m_pClient)), "#996666");          .arg(::lscp_client_get_errno(m_pClient)), "#996666");
1841    
1842            // Make it look responsive...:)
1843            QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
1844  }  }
1845    
1846    
# Line 1817  void qsamplerMainForm::timerSlot (void) Line 2052  void qsamplerMainForm::timerSlot (void)
2052          }          }
2053      }      }
2054    
2055          // Refresh each channel usage, on each period...          if (m_pClient) {
2056          if (m_pClient && (m_changedStrips.count() > 0 || m_pOptions->bAutoRefresh)) {                  // Update the channel information for each pending strip...
2057                  m_iTimerSlot += QSAMPLER_TIMER_MSECS;                  if (m_changedStrips.count() > 0) {
                 if (m_iTimerSlot >= m_pOptions->iAutoRefreshTime && m_pWorkspace->isUpdatesEnabled())  {  
                         m_iTimerSlot = 0;  
                         // Update the channel information for each pending strip...  
2058                          for (qsamplerChannelStrip *pChannelStrip = m_changedStrips.first();                          for (qsamplerChannelStrip *pChannelStrip = m_changedStrips.first();
2059                                          pChannelStrip;                                          pChannelStrip; pChannelStrip = m_changedStrips.next()) {
                                                 pChannelStrip = m_changedStrips.next()) {  
2060                                  // If successfull, remove from pending list...                                  // If successfull, remove from pending list...
2061                                  if (pChannelStrip->updateChannelInfo())                                  if (pChannelStrip->updateChannelInfo())
2062                                          m_changedStrips.remove(pChannelStrip);                                          m_changedStrips.remove(pChannelStrip);
2063                          }                          }
2064                          // Update the channel stream usage for each strip...                  }
2065                          QWidgetList wlist = m_pWorkspace->windowList();                  // Refresh each channel usage, on each period...
2066                          for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {                  if (m_pOptions->bAutoRefresh) {
2067                                  qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);                          m_iTimerSlot += QSAMPLER_TIMER_MSECS;
2068                                  if (pChannelStrip && pChannelStrip->isVisible())                          if (m_iTimerSlot >= m_pOptions->iAutoRefreshTime)  {
2069                                          pChannelStrip->updateChannelUsage();                                  m_iTimerSlot = 0;
2070                                    // Update the channel stream usage for each strip...
2071                                    QWidgetList wlist = m_pWorkspace->windowList();
2072                                    for (int iChannel = 0;
2073                                                    iChannel < (int) wlist.count(); iChannel++) {
2074                                            qsamplerChannelStrip *pChannelStrip
2075                                                    = (qsamplerChannelStrip *) wlist.at(iChannel);
2076                                            if (pChannelStrip && pChannelStrip->isVisible())
2077                                                    pChannelStrip->updateChannelUsage();
2078                                    }
2079                          }                          }
2080                  }                  }
2081          }          }
# Line 1860  void qsamplerMainForm::startServer (void Line 2100  void qsamplerMainForm::startServer (void
2100    
2101      // Is the server process instance still here?      // Is the server process instance still here?
2102      if (m_pServer) {      if (m_pServer) {
2103          switch (QMessageBox::warning(this, tr("Warning"),          switch (QMessageBox::warning(this,
2104                            QSAMPLER_TITLE ": " + tr("Warning"),
2105              tr("Could not start the LinuxSampler server.\n\n"              tr("Could not start the LinuxSampler server.\n\n"
2106                 "Maybe it ss already started."),                 "Maybe it ss already started."),
2107              tr("Stop"), tr("Kill"), tr("Cancel"))) {              tr("Stop"), tr("Kill"), tr("Cancel"))) {
# Line 2019  bool qsamplerMainForm::startClient (void Line 2260  bool qsamplerMainForm::startClient (void
2260      ::lscp_client_set_timeout(m_pClient, m_pOptions->iServerTimeout);      ::lscp_client_set_timeout(m_pClient, m_pOptions->iServerTimeout);
2261      appendMessages(tr("Client receive timeout is set to %1 msec.").arg(::lscp_client_get_timeout(m_pClient)));      appendMessages(tr("Client receive timeout is set to %1 msec.").arg(::lscp_client_get_timeout(m_pClient)));
2262    
2263            // Subscribe to channel info change notifications...
2264            if (::lscp_client_subscribe(m_pClient, LSCP_EVENT_CHANNEL_INFO) != LSCP_OK)
2265                    appendMessagesClient("lscp_client_subscribe");
2266    
2267      // We may stop scheduling around.      // We may stop scheduling around.
2268      stopSchedule();      stopSchedule();
2269    
# Line 2028  bool qsamplerMainForm::startClient (void Line 2273  bool qsamplerMainForm::startClient (void
2273      // Log success here.      // Log success here.
2274      appendMessages(tr("Client connected."));      appendMessages(tr("Client connected."));
2275    
2276          // Hard-notify device configuration form,          // Hard-notify instrumnet and device configuration forms,
2277          // if visible, that we're ready...          // if visible, that we're ready...
2278          if (m_pDeviceForm && m_pDeviceForm->isVisible())          if (m_pInstrumentListForm)
2279              m_pDeviceForm->setClient(m_pClient);              m_pInstrumentListForm->refreshInstruments();
2280                        if (m_pDeviceForm)
2281                m_pDeviceForm->refreshDevices();
2282    
2283      // Is any session pending to be loaded?      // Is any session pending to be loaded?
2284      if (!m_pOptions->sSessionFile.isEmpty()) {      if (!m_pOptions->sSessionFile.isEmpty()) {
2285          // Just load the prabably startup session...          // Just load the prabably startup session...
# Line 2053  void qsamplerMainForm::stopClient (void) Line 2300  void qsamplerMainForm::stopClient (void)
2300      if (m_pClient == NULL)      if (m_pClient == NULL)
2301          return;          return;
2302    
         // Hard-notify device configuration form,  
         // if visible, that we're running out...  
         if (m_pDeviceForm && m_pDeviceForm->isVisible())  
             m_pDeviceForm->setClient(NULL);  
   
2303      // Log prepare here.      // Log prepare here.
2304      appendMessages(tr("Client disconnecting..."));      appendMessages(tr("Client disconnecting..."));
2305    
# Line 2074  void qsamplerMainForm::stopClient (void) Line 2316  void qsamplerMainForm::stopClient (void)
2316      closeSession(false);      closeSession(false);
2317    
2318      // Close us as a client...      // Close us as a client...
2319      lscp_client_destroy(m_pClient);          ::lscp_client_unsubscribe(m_pClient, LSCP_EVENT_CHANNEL_INFO);
2320        ::lscp_client_destroy(m_pClient);
2321      m_pClient = NULL;      m_pClient = NULL;
2322    
2323            // Hard-notify instrumnet and device configuration forms,
2324            // if visible, that we're running out...
2325            if (m_pInstrumentListForm)
2326                m_pInstrumentListForm->refreshInstruments();
2327            if (m_pDeviceForm)
2328                m_pDeviceForm->refreshDevices();
2329    
2330      // Log final here.      // Log final here.
2331      appendMessages(tr("Client disconnected."));      appendMessages(tr("Client disconnected."));
2332    

Legend:
Removed from v.661  
changed lines
  Added in v.1013

  ViewVC Help
Powered by ViewVC