/[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 395 by capela, Sun Feb 20 19:13:33 2005 UTC revision 428 by capela, Mon Mar 7 17:05:55 2005 UTC
# Line 41  Line 41 
41  #include "qsamplerMessages.h"  #include "qsamplerMessages.h"
42    
43  #include "qsamplerChannelStrip.h"  #include "qsamplerChannelStrip.h"
44    
45    #include "qsamplerDeviceForm.h"
46  #include "qsamplerOptionsForm.h"  #include "qsamplerOptionsForm.h"
47    
48  #include "config.h"  #include "config.h"
# Line 105  void qsamplerMainForm::init (void) Line 107  void qsamplerMainForm::init (void)
107      m_pOptions = NULL;      m_pOptions = NULL;
108    
109      // All child forms are to be created later, not earlier than setup.      // All child forms are to be created later, not earlier than setup.
110      m_pMessages = NULL;      m_pMessages   = NULL;
111        m_pDeviceForm = NULL;
112    
113      // We'll start clean.      // We'll start clean.
114      m_iUntitled    = 0;      m_iUntitled   = 0;
115      m_iDirtyCount  = 0;      m_iDirtyCount = 0;
     m_iChangeCount = 0;  
116    
117      m_pServer = NULL;      m_pServer = NULL;
118      m_pClient = NULL;      m_pClient = NULL;
# Line 139  void qsamplerMainForm::init (void) Line 141  void qsamplerMainForm::init (void)
141      pLabel = new QLabel(tr("Connected"), this);      pLabel = new QLabel(tr("Connected"), this);
142      pLabel->setAlignment(Qt::AlignLeft);      pLabel->setAlignment(Qt::AlignLeft);
143      pLabel->setMinimumSize(pLabel->sizeHint());      pLabel->setMinimumSize(pLabel->sizeHint());
144      m_status[QSAMPLER_STATUS_CLIENT] = pLabel;      m_statusItem[QSAMPLER_STATUS_CLIENT] = pLabel;
145      statusBar()->addWidget(pLabel);      statusBar()->addWidget(pLabel);
146      // Server address.      // Server address.
147      pLabel = new QLabel(this);      pLabel = new QLabel(this);
148      pLabel->setAlignment(Qt::AlignLeft);      pLabel->setAlignment(Qt::AlignLeft);
149      m_status[QSAMPLER_STATUS_SERVER] = pLabel;      m_statusItem[QSAMPLER_STATUS_SERVER] = pLabel;
150      statusBar()->addWidget(pLabel, 1);      statusBar()->addWidget(pLabel, 1);
151      // Channel title.      // Channel title.
152      pLabel = new QLabel(this);      pLabel = new QLabel(this);
153      pLabel->setAlignment(Qt::AlignLeft);      pLabel->setAlignment(Qt::AlignLeft);
154      m_status[QSAMPLER_STATUS_CHANNEL] = pLabel;      m_statusItem[QSAMPLER_STATUS_CHANNEL] = pLabel;
155      statusBar()->addWidget(pLabel, 2);      statusBar()->addWidget(pLabel, 2);
156      // Session modification status.      // Session modification status.
157      pLabel = new QLabel(tr("MOD"), this);      pLabel = new QLabel(tr("MOD"), this);
158      pLabel->setAlignment(Qt::AlignHCenter);      pLabel->setAlignment(Qt::AlignHCenter);
159      pLabel->setMinimumSize(pLabel->sizeHint());      pLabel->setMinimumSize(pLabel->sizeHint());
160      m_status[QSAMPLER_STATUS_SESSION] = pLabel;      m_statusItem[QSAMPLER_STATUS_SESSION] = pLabel;
161      statusBar()->addWidget(pLabel);      statusBar()->addWidget(pLabel);
162    
163      // Create the recent files sub-menu.      // Create the recent files sub-menu.
# Line 174  void qsamplerMainForm::destroy (void) Line 176  void qsamplerMainForm::destroy (void)
176  {  {
177      // Do final processing anyway.      // Do final processing anyway.
178      processServerExit();      processServerExit();
179        
180      // Delete recentfiles menu.  #if defined(WIN32)
181      if (m_pRecentFilesMenu)      WSACleanup();
182          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];  
183    
184      // Finally drop any widgets around...      // Finally drop any widgets around...
185        if (m_pDeviceForm)
186            delete m_pDeviceForm;
187      if (m_pMessages)      if (m_pMessages)
188          delete m_pMessages;          delete m_pMessages;
189      if (m_pWorkspace)      if (m_pWorkspace)
190          delete m_pWorkspace;          delete m_pWorkspace;
191    
192  #if defined(WIN32)      // Delete status item labels one by one.
193      WSACleanup();      if (m_statusItem[QSAMPLER_STATUS_CLIENT])
194  #endif          delete m_statusItem[QSAMPLER_STATUS_CLIENT];
195        if (m_statusItem[QSAMPLER_STATUS_SERVER])
196            delete m_statusItem[QSAMPLER_STATUS_SERVER];
197        if (m_statusItem[QSAMPLER_STATUS_CHANNEL])
198            delete m_statusItem[QSAMPLER_STATUS_CHANNEL];
199        if (m_statusItem[QSAMPLER_STATUS_SESSION])
200            delete m_statusItem[QSAMPLER_STATUS_SESSION];
201    
202        // Delete recentfiles menu.
203        if (m_pRecentFilesMenu)
204            delete m_pRecentFilesMenu;
205  }  }
206    
207    
# Line 208  void qsamplerMainForm::setup ( qsamplerO Line 213  void qsamplerMainForm::setup ( qsamplerO
213    
214      // Some child forms are to be created right now.      // Some child forms are to be created right now.
215      m_pMessages = new qsamplerMessages(this);      m_pMessages = new qsamplerMessages(this);
216        m_pDeviceForm = new qsamplerDeviceForm(this);
217      // Set message defaults...      // Set message defaults...
218      updateMessagesFont();      updateMessagesFont();
219      updateMessagesLimit();      updateMessagesLimit();
# Line 236  void qsamplerMainForm::setup ( qsamplerO Line 242  void qsamplerMainForm::setup ( qsamplerO
242          QTextIStream istr(&sDockables);          QTextIStream istr(&sDockables);
243          istr >> *this;          istr >> *this;
244      }      }
245      // Try to restore old window positioning.      // Try to restore old window positioning and initial visibility.
246      m_pOptions->loadWidgetGeometry(this);      m_pOptions->loadWidgetGeometry(this);
247        m_pOptions->loadWidgetGeometry(m_pDeviceForm);
248    
249      // Final startup stabilization...      // Final startup stabilization...
250      updateRecentFilesMenu();      updateRecentFilesMenu();
# Line 264  bool qsamplerMainForm::queryClose (void) Line 271  bool qsamplerMainForm::queryClose (void)
271          // Some windows default fonts is here on demand too.          // Some windows default fonts is here on demand too.
272          if (bQueryClose && m_pMessages)          if (bQueryClose && m_pMessages)
273              m_pOptions->sMessagesFont = m_pMessages->messagesFont().toString();              m_pOptions->sMessagesFont = m_pMessages->messagesFont().toString();
274                    // Other windows just need asking if it can close gracefully...
275            if (bQueryClose && m_pDeviceForm)
276                    bQueryClose = m_pDeviceForm->queryClose();
277          // Try to save current positioning.          // Try to save current positioning.
278          if (bQueryClose) {          if (bQueryClose) {
279              // Save decorations state.              // Save decorations state.
# Line 275  bool qsamplerMainForm::queryClose (void) Line 285  bool qsamplerMainForm::queryClose (void)
285              QTextOStream ostr(&sDockables);              QTextOStream ostr(&sDockables);
286              ostr << *this;              ostr << *this;
287              m_pOptions->settings().writeEntry("/Layout/DockWindows", sDockables);              m_pOptions->settings().writeEntry("/Layout/DockWindows", sDockables);
288              // And the main windows state.              // And the children, and the main windows state,.
289                    m_pOptions->saveWidgetGeometry(m_pDeviceForm);
290              m_pOptions->saveWidgetGeometry(this);              m_pOptions->saveWidgetGeometry(this);
291                    // Close popup widgets.
292                    if (m_pDeviceForm)
293                        m_pDeviceForm->close();
294              // Stop client and/or server, gracefully.              // Stop client and/or server, gracefully.
295              stopServer();              stopServer();
296          }          }
# Line 306  bool qsamplerMainForm::decodeDragFiles ( Line 320  bool qsamplerMainForm::decodeDragFiles (
320          if (bDecode) {          if (bDecode) {
321              files = QStringList::split('\n', sText);              files = QStringList::split('\n', sText);
322              for (QStringList::Iterator iter = files.begin(); iter != files.end(); iter++)              for (QStringList::Iterator iter = files.begin(); iter != files.end(); iter++)
323                  *iter = (*iter).stripWhiteSpace().replace(QRegExp("^file:"), QString::null);                  *iter = QUrl((*iter).stripWhiteSpace().replace(QRegExp("^file:"), QString::null)).path();
324          }          }
325      }      }
326    
# Line 330  void qsamplerMainForm::dropEvent ( QDrop Line 344  void qsamplerMainForm::dropEvent ( QDrop
344          return;          return;
345    
346      for (QStringList::Iterator iter = files.begin(); iter != files.end(); iter++) {      for (QStringList::Iterator iter = files.begin(); iter != files.end(); iter++) {
347                  const QString& sPath = QUrl(*iter).path();                  const QString& sPath = *iter;
348                  if (qsamplerChannel::isInstrumentFile(sPath)) {                  if (qsamplerChannel::isInstrumentFile(sPath)) {
349                          // Try to create a new channel from instrument file...                          // Try to create a new channel from instrument file...
350                      qsamplerChannel *pChannel = new qsamplerChannel(this);                      qsamplerChannel *pChannel = new qsamplerChannel(this);
# Line 351  void qsamplerMainForm::dropEvent ( QDrop Line 365  void qsamplerMainForm::dropEvent ( QDrop
365                          }                          }
366                      // Make that an overall update.                      // Make that an overall update.
367                      m_iDirtyCount++;                      m_iDirtyCount++;
                     m_iChangeCount++;  
368                      stabilizeForm();                      stabilizeForm();
369                  }   // Otherwise, load an usual session file (LSCP script)...                  }   // Otherwise, load an usual session file (LSCP script)...
370                  else if (closeSession(true))                  else if (closeSession(true))
# Line 612  bool qsamplerMainForm::loadSessionFile ( Line 625  bool qsamplerMainForm::loadSessionFile (
625      appendMessages(tr("Open session: \"%1\".").arg(sessionName(m_sFilename)));      appendMessages(tr("Open session: \"%1\".").arg(sessionName(m_sFilename)));
626            
627      // Make that an overall update.      // Make that an overall update.
     m_iChangeCount++;  
628      stabilizeForm();      stabilizeForm();
629      return true;      return true;
630  }  }
# Line 650  bool qsamplerMainForm::saveSessionFile ( Line 662  bool qsamplerMainForm::saveSessionFile (
662          if (pChannelStrip) {          if (pChannelStrip) {
663              qsamplerChannel *pChannel = pChannelStrip->channel();              qsamplerChannel *pChannel = pChannelStrip->channel();
664              if (pChannel) {              if (pChannel) {
665                  int iChannelID = pChannel->channelID();                  ts << "# Channel " << iChannel << endl;
                 ts << "# " << pChannelStrip->caption() << endl;  
666                  ts << "ADD CHANNEL" << endl;                  ts << "ADD CHANNEL" << endl;
667                  ts << "SET CHANNEL AUDIO_OUTPUT_TYPE " << iChannelID << " " << pChannel->audioDriver() << endl;                  ts << "SET CHANNEL AUDIO_OUTPUT_TYPE " << iChannel << " " << pChannel->audioDriver() << endl;
668                  ts << "SET CHANNEL MIDI_INPUT_TYPE " << iChannelID << " " << pChannel->midiDriver() << endl;                  ts << "SET CHANNEL MIDI_INPUT_TYPE " << iChannel << " " << pChannel->midiDriver() << endl;
669                  ts << "SET CHANNEL MIDI_INPUT_PORT " << iChannelID << " " << pChannel->midiPort() << endl;              //  ts << "SET CHANNEL MIDI_INPUT_PORT " << iChannel << " " << pChannel->midiPort() << endl;
670                  ts << "SET CHANNEL MIDI_INPUT_CHANNEL " << iChannelID << " ";                  ts << "SET CHANNEL MIDI_INPUT_CHANNEL " << iChannel << " ";
671                  if (pChannel->midiChannel() == LSCP_MIDI_CHANNEL_ALL)                  if (pChannel->midiChannel() == LSCP_MIDI_CHANNEL_ALL)
672                      ts << "ALL";                      ts << "ALL";
673                  else                  else
674                      ts << pChannel->midiChannel();                      ts << pChannel->midiChannel();
675                  ts << endl;                  ts << endl;
676                  ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannelID << endl;                  ts << "LOAD ENGINE " << pChannel->engineName() << " " << iChannel << endl;
677                  ts << "LOAD INSTRUMENT NON_MODAL '" << pChannel->instrumentFile() << "' " << pChannel->instrumentNr() << " " << iChannelID << endl;                  ts << "LOAD INSTRUMENT NON_MODAL '" << pChannel->instrumentFile() << "' " << pChannel->instrumentNr() << " " << iChannel << endl;
678                  ts << "SET CHANNEL VOLUME " << iChannelID << " " << pChannel->volume() << endl;                  ts << "SET CHANNEL VOLUME " << iChannel << " " << pChannel->volume() << endl;
679                  ts << endl;                  ts << endl;
680              }              }
681          }          }
# Line 837  void qsamplerMainForm::editAddChannel (v Line 848  void qsamplerMainForm::editAddChannel (v
848    
849      // Make that an overall update.      // Make that an overall update.
850      m_iDirtyCount++;      m_iDirtyCount++;
     m_iChangeCount++;  
851      stabilizeForm();      stabilizeForm();
852  }  }
853    
# Line 909  void qsamplerMainForm::editResetChannel Line 919  void qsamplerMainForm::editResetChannel
919      if (pChannelStrip == NULL)      if (pChannelStrip == NULL)
920          return;          return;
921    
922      qsamplerChannel *pChannel = pChannelStrip->channel();      // Just invoque the channel strip procedure.
923      if (pChannel == NULL)      pChannelStrip->channelReset();
924          return;  }
925    
926    
927      // Reset the existing sampler channel.  // Reset all sampler channels.
928      pChannel->resetChannel();  void qsamplerMainForm::editResetAllChannels (void)
929    {
930        if (m_pClient == NULL)
931            return;
932    
933      // And force a deferred update.      // Invoque the channel strip procedure,
934      m_iChangeCount++;          // for all channels out there...
935        m_pWorkspace->setUpdatesEnabled(false);
936        QWidgetList wlist = m_pWorkspace->windowList();
937        for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
938            qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
939            if (pChannelStrip)
940                    pChannelStrip->channelReset();
941        }
942        m_pWorkspace->setUpdatesEnabled(true);
943  }  }
944    
945    
# Line 969  void qsamplerMainForm::viewMessages ( bo Line 991  void qsamplerMainForm::viewMessages ( bo
991  }  }
992    
993    
994    // Show/hide the device configurator form.
995    void qsamplerMainForm::viewDevices (void)
996    {
997        if (m_pOptions == NULL)
998            return;
999    
1000        if (m_pDeviceForm) {
1001            m_pOptions->saveWidgetGeometry(m_pDeviceForm);
1002                    m_pDeviceForm->setClient(m_pClient);
1003            if (m_pDeviceForm->isVisible()) {
1004                m_pDeviceForm->hide();
1005            } else {
1006                m_pDeviceForm->show();
1007                m_pDeviceForm->raise();
1008                m_pDeviceForm->setActiveWindow();
1009            }
1010        }
1011    }
1012    
1013    
1014  // Show options dialog.  // Show options dialog.
1015  void qsamplerMainForm::viewOptions (void)  void qsamplerMainForm::viewOptions (void)
1016  {  {
# Line 1161  void qsamplerMainForm::helpAbout (void) Line 1203  void qsamplerMainForm::helpAbout (void)
1203  void qsamplerMainForm::stabilizeForm (void)  void qsamplerMainForm::stabilizeForm (void)
1204  {  {
1205      // Update the main application caption...      // Update the main application caption...
1206      QString sSessioName = sessionName(m_sFilename);      QString sSessionName = sessionName(m_sFilename);
1207      if (m_iDirtyCount > 0)      if (m_iDirtyCount > 0)
1208          sSessioName += '*';          sSessionName += '*';
1209      setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessioName));      setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessionName));
1210    
1211      // Update the main menu state...      // Update the main menu state...
1212      qsamplerChannelStrip *pChannelStrip = activeChannelStrip();      qsamplerChannelStrip *pChannelStrip = activeChannelStrip();
# Line 1180  void qsamplerMainForm::stabilizeForm (vo Line 1222  void qsamplerMainForm::stabilizeForm (vo
1222      editRemoveChannelAction->setEnabled(bHasChannel);      editRemoveChannelAction->setEnabled(bHasChannel);
1223      editSetupChannelAction->setEnabled(bHasChannel);      editSetupChannelAction->setEnabled(bHasChannel);
1224      editResetChannelAction->setEnabled(bHasChannel);      editResetChannelAction->setEnabled(bHasChannel);
1225      channelsArrangeAction->setEnabled(bHasChannel);      editResetAllChannelsAction->setEnabled(bHasChannel);
1226      viewMessagesAction->setOn(m_pMessages && m_pMessages->isVisible());      viewMessagesAction->setOn(m_pMessages && m_pMessages->isVisible());
1227        viewDevicesAction->setOn(m_pDeviceForm && m_pDeviceForm->isVisible());
1228        viewDevicesAction->setEnabled(bHasClient);
1229        channelsArrangeAction->setEnabled(bHasChannel);
1230    
1231      // Client/Server status...      // Client/Server status...
1232      if (bHasClient) {      if (bHasClient) {
1233          m_status[QSAMPLER_STATUS_CLIENT]->setText(tr("Connected"));          m_statusItem[QSAMPLER_STATUS_CLIENT]->setText(tr("Connected"));
1234          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));
1235      } else {      } else {
1236          m_status[QSAMPLER_STATUS_CLIENT]->clear();          m_statusItem[QSAMPLER_STATUS_CLIENT]->clear();
1237          m_status[QSAMPLER_STATUS_SERVER]->clear();          m_statusItem[QSAMPLER_STATUS_SERVER]->clear();
1238      }      }
1239      // Channel status...      // Channel status...
1240      if (bHasChannel)      if (bHasChannel)
1241          m_status[QSAMPLER_STATUS_CHANNEL]->setText(pChannelStrip->caption());          m_statusItem[QSAMPLER_STATUS_CHANNEL]->setText(pChannelStrip->caption());
1242      else      else
1243          m_status[QSAMPLER_STATUS_CHANNEL]->clear();          m_statusItem[QSAMPLER_STATUS_CHANNEL]->clear();
1244      // Session status...      // Session status...
1245      if (m_iDirtyCount > 0)      if (m_iDirtyCount > 0)
1246          m_status[QSAMPLER_STATUS_SESSION]->setText(tr("MOD"));          m_statusItem[QSAMPLER_STATUS_SESSION]->setText(tr("MOD"));
1247      else      else
1248          m_status[QSAMPLER_STATUS_SESSION]->clear();          m_statusItem[QSAMPLER_STATUS_SESSION]->clear();
1249    
1250      // Recent files menu.      // Recent files menu.
1251      m_pRecentFilesMenu->setEnabled(bHasClient && m_pOptions->recentFiles.count() > 0);      m_pRecentFilesMenu->setEnabled(bHasClient && m_pOptions->recentFiles.count() > 0);
# Line 1212  void qsamplerMainForm::stabilizeForm (vo Line 1257  void qsamplerMainForm::stabilizeForm (vo
1257    
1258    
1259  // Channel change receiver slot.  // Channel change receiver slot.
1260  void qsamplerMainForm::channelStripChanged( qsamplerChannelStrip * )  void qsamplerMainForm::channelStripChanged( qsamplerChannelStrip *pChannelStrip )
1261  {  {
1262      // Flag that we're update those channel strips.          // Add this strip to the changed list...
1263      m_iChangeCount++;          if (m_changedStrips.containsRef(pChannelStrip) == 0)
1264                    m_changedStrips.append(pChannelStrip);
1265    
1266      // Just mark the dirty form.      // Just mark the dirty form.
1267      m_iDirtyCount++;      m_iDirtyCount++;
1268      // and update the form status...      // and update the form status...
# Line 1525  qsamplerChannelStrip *qsamplerMainForm:: Line 1572  qsamplerChannelStrip *qsamplerMainForm::
1572          int iHeight = pChannelStrip->parentWidget()->frameGeometry().height();          int iHeight = pChannelStrip->parentWidget()->frameGeometry().height();
1573          pChannelStrip->parentWidget()->setGeometry(0, y, iWidth, iHeight);          pChannelStrip->parentWidget()->setGeometry(0, y, iWidth, iHeight);
1574      }      }
1575        
1576            // This is pretty new, so we'll watch for it closely.
1577            channelStripChanged(pChannelStrip);
1578    
1579      // Return our successful reference...      // Return our successful reference...
1580      return pChannelStrip;      return pChannelStrip;
1581  }  }
# Line 1638  void qsamplerMainForm::timerSlot (void) Line 1688  void qsamplerMainForm::timerSlot (void)
1688      }      }
1689            
1690          // Refresh each channel usage, on each period...          // Refresh each channel usage, on each period...
1691      if (m_pClient && (m_iChangeCount > 0 || m_pOptions->bAutoRefresh)) {      if (m_pClient && (m_changedStrips.count() > 0 || m_pOptions->bAutoRefresh)) {
1692          m_iTimerSlot += QSAMPLER_TIMER_MSECS;          m_iTimerSlot += QSAMPLER_TIMER_MSECS;
1693          if (m_iTimerSlot >= m_pOptions->iAutoRefreshTime && m_pWorkspace->isUpdatesEnabled())  {          if (m_iTimerSlot >= m_pOptions->iAutoRefreshTime && m_pWorkspace->isUpdatesEnabled())  {
1694              m_iTimerSlot = 0;              m_iTimerSlot = 0;
1695              m_iChangeCount = 0;              // Update the channel information for each pending strip...
1696                for (qsamplerChannelStrip *pChannelStrip = m_changedStrips.first();
1697                        pChannelStrip;
1698                                                    pChannelStrip = m_changedStrips.next()) {
1699                                    // If successfull, remove from pending list...
1700                                    if (pChannelStrip->updateChannelInfo())
1701                        m_changedStrips.remove(pChannelStrip);
1702                            }
1703                // Update the channel stream usage for each strip...
1704              QWidgetList wlist = m_pWorkspace->windowList();              QWidgetList wlist = m_pWorkspace->windowList();
1705              for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {              for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
1706                  qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);                  qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
1707                  if (pChannelStrip && pChannelStrip->isVisible()) {                  if (pChannelStrip && pChannelStrip->isVisible())
1708                      // If we can't make it clean, try next time.                      pChannelStrip->updateChannelUsage();
                     if (!pChannelStrip->updateChannelUsage())  
                         m_iChangeCount++;  
                 }  
1709              }              }
1710          }          }
1711      }      }
# Line 1843  bool qsamplerMainForm::startClient (void Line 1898  bool qsamplerMainForm::startClient (void
1898      // Log success here.      // Log success here.
1899      appendMessages(tr("Client connected."));      appendMessages(tr("Client connected."));
1900    
1901            // Hard-notify device configuration form,
1902            // if visible, that we're ready...
1903            if (m_pDeviceForm && m_pDeviceForm->isVisible())
1904                m_pDeviceForm->setClient(m_pClient);
1905                
1906      // Is any session pending to be loaded?      // Is any session pending to be loaded?
1907      if (!m_pOptions->sSessionFile.isEmpty()) {      if (!m_pOptions->sSessionFile.isEmpty()) {
1908          // Just load the prabably startup session...          // Just load the prabably startup session...
# Line 1863  void qsamplerMainForm::stopClient (void) Line 1923  void qsamplerMainForm::stopClient (void)
1923      if (m_pClient == NULL)      if (m_pClient == NULL)
1924          return;          return;
1925    
1926            // Hard-notify device configuration form,
1927            // if visible, that we're running out...
1928            if (m_pDeviceForm && m_pDeviceForm->isVisible())
1929                m_pDeviceForm->setClient(NULL);
1930    
1931      // Log prepare here.      // Log prepare here.
1932      appendMessages(tr("Client disconnecting..."));      appendMessages(tr("Client disconnecting..."));
1933    
Legend:
Removed from v.395  
changed lines
  Added in v.428
  ViewVC Help
Powered by ViewVC