/[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 409 by capela, Thu Feb 24 12:10:54 2005 UTC revision 487 by capela, Thu Mar 31 14:17:19 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;
# Line 138  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 173  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 205  void qsamplerMainForm::setup ( qsamplerO Line 211  void qsamplerMainForm::setup ( qsamplerO
211      // We got options?      // We got options?
212      m_pOptions = pOptions;      m_pOptions = pOptions;
213    
214        // What style do we create these forms?
215        WFlags wflags = Qt::WType_TopLevel;
216        if (m_pOptions->bKeepOnTop)
217            wflags |= Qt::WStyle_Tool;
218      // Some child forms are to be created right now.      // Some child forms are to be created right now.
219      m_pMessages = new qsamplerMessages(this);      m_pMessages = new qsamplerMessages(this);
220        m_pDeviceForm = new qsamplerDeviceForm(this, 0, wflags);
221        m_pDeviceForm->setMainForm(this); // An important life immutable!
222      // Set message defaults...      // Set message defaults...
223      updateMessagesFont();      updateMessagesFont();
224      updateMessagesLimit();      updateMessagesLimit();
# Line 235  void qsamplerMainForm::setup ( qsamplerO Line 247  void qsamplerMainForm::setup ( qsamplerO
247          QTextIStream istr(&sDockables);          QTextIStream istr(&sDockables);
248          istr >> *this;          istr >> *this;
249      }      }
250      // Try to restore old window positioning.      // Try to restore old window positioning and initial visibility.
251      m_pOptions->loadWidgetGeometry(this);      m_pOptions->loadWidgetGeometry(this);
252        m_pOptions->loadWidgetGeometry(m_pDeviceForm);
253    
254      // Final startup stabilization...      // Final startup stabilization...
255      updateRecentFilesMenu();      updateRecentFilesMenu();
# Line 274  bool qsamplerMainForm::queryClose (void) Line 287  bool qsamplerMainForm::queryClose (void)
287              QTextOStream ostr(&sDockables);              QTextOStream ostr(&sDockables);
288              ostr << *this;              ostr << *this;
289              m_pOptions->settings().writeEntry("/Layout/DockWindows", sDockables);              m_pOptions->settings().writeEntry("/Layout/DockWindows", sDockables);
290              // And the main windows state.              // And the children, and the main windows state,.
291                    m_pOptions->saveWidgetGeometry(m_pDeviceForm);
292              m_pOptions->saveWidgetGeometry(this);              m_pOptions->saveWidgetGeometry(this);
293                    // Close popup widgets.
294                    if (m_pDeviceForm)
295                        m_pDeviceForm->close();
296              // Stop client and/or server, gracefully.              // Stop client and/or server, gracefully.
297              stopServer();              stopServer();
298          }          }
# Line 582  bool qsamplerMainForm::loadSessionFile ( Line 599  bool qsamplerMainForm::loadSessionFile (
599              if (::lscp_client_query(m_pClient, sCommand.latin1()) != LSCP_OK) {              if (::lscp_client_query(m_pClient, sCommand.latin1()) != LSCP_OK) {
600                  appendMessagesClient("lscp_client_query");                  appendMessagesClient("lscp_client_query");
601                  iErrors++;                  iErrors++;
                 break;  
602              }              }
603          }          }
604          // Try to make it snappy :)          // Try to make it snappy :)
# Line 592  bool qsamplerMainForm::loadSessionFile ( Line 608  bool qsamplerMainForm::loadSessionFile (
608      // Ok. we've read it.      // Ok. we've read it.
609      file.close();      file.close();
610    
     // Have we any errors?  
     if (iErrors > 0)  
         appendMessagesError(tr("Session could not be loaded\nfrom \"%1\".\n\nSorry.").arg(sFilename));  
   
611          // Now we'll try to create (update) the whole GUI session.          // Now we'll try to create (update) the whole GUI session.
612          updateSession();          updateSession();
613    
614            // Have we any errors?
615            if (iErrors > 0)
616                    appendMessagesError(tr("Session loaded with errors\nfrom \"%1\".\n\nSorry.").arg(sFilename));
617    
618      // Save as default session directory.      // Save as default session directory.
619      if (m_pOptions)      if (m_pOptions)
620          m_pOptions->sSessionDir = QFileInfo(sFilename).dirPath(true);          m_pOptions->sSessionDir = QFileInfo(sFilename).dirPath(true);
621      // We're not dirty anymore.          // We're not dirty anymore, if loaded without errors,
622      m_iDirtyCount = 0;          m_iDirtyCount = iErrors;
623      // Stabilize form...      // Stabilize form...
624      m_sFilename = sFilename;      m_sFilename = sFilename;
625      updateRecentFiles(sFilename);      updateRecentFiles(sFilename);
# Line 626  bool qsamplerMainForm::saveSessionFile ( Line 642  bool qsamplerMainForm::saveSessionFile (
642      }      }
643    
644      // Write the file.      // Write the file.
645      int iErrors = 0;      int  iErrors = 0;
646      QTextStream ts(&file);      QTextStream ts(&file);
647      ts << "# " << QSAMPLER_TITLE " - " << tr(QSAMPLER_SUBTITLE) << endl;      ts << "# " << QSAMPLER_TITLE " - " << tr(QSAMPLER_SUBTITLE) << endl;
648      ts << "# " << tr("Version")      ts << "# " << tr("Version")
# Line 637  bool qsamplerMainForm::saveSessionFile ( Line 653  bool qsamplerMainForm::saveSessionFile (
653      ts << "# " << tr("File")      ts << "# " << tr("File")
654         << ": " << QFileInfo(sFilename).fileName() << endl;         << ": " << QFileInfo(sFilename).fileName() << endl;
655      ts << "# " << tr("Date")      ts << "# " << tr("Date")
656         << ": " << QDate::currentDate().toString("MMMM dd yyyy")         << ": " << QDate::currentDate().toString("MMM dd yyyy")
657         << " "  << QTime::currentTime().toString("hh:mm:ss") << endl;         << " "  << QTime::currentTime().toString("hh:mm:ss") << endl;
658      ts << "#"  << endl;      ts << "#"  << endl;
659      ts << endl;      ts << endl;
660            // It is assumed that this new kind of device+session file
661            // will be loaded from a complete
662            int *piDeviceIDs;
663            int  iDevice;
664            ts << "RESET" << endl;
665            // Audio device mapping.
666            QMap<int, int> audioDeviceMap;
667            piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Audio);
668            for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
669                    ts << endl;
670                    qsamplerDevice device(this, qsamplerDevice::Audio, piDeviceIDs[iDevice]);
671                    // Audio device specification...
672                    ts << "# " << device.deviceTypeName() << " " << device.driverName()
673                       << " " << tr("Device") << " " << iDevice << endl;
674                    ts << "CREATE AUDIO_OUTPUT_DEVICE " << device.driverName();
675                    qsamplerDeviceParamMap::ConstIterator deviceParam;
676                    for (deviceParam = device.params().begin();
677                                    deviceParam != device.params().end();
678                                            ++deviceParam) {
679                            const qsamplerDeviceParam& param = deviceParam.data();
680                            if (param.value.isEmpty()) ts << "# ";
681                            ts << " " << deviceParam.key() << "='" << param.value << "'";
682                    }
683                    ts << endl;
684                    // Audio channel parameters...
685                    int iPort = 0;
686                    for (qsamplerDevicePort *pPort = device.ports().first();
687                                    pPort;
688                                            pPort = device.ports().next(), ++iPort) {
689                            qsamplerDeviceParamMap::ConstIterator portParam;
690                            for (portParam = pPort->params().begin();
691                                            portParam != pPort->params().end();
692                                                    ++portParam) {
693                                    const qsamplerDeviceParam& param = portParam.data();
694                                    if (param.fix || param.value.isEmpty()) ts << "# ";
695                                    ts << "SET AUDIO_OUTPUT_CHANNEL_PARAMETER " << iDevice
696                                       << " " << iPort << " " << portParam.key()
697                                       << "='" << param.value << "'" << endl;
698                            }
699                    }
700                    // Audio device index/id mapping.
701                    audioDeviceMap[device.deviceID()] = iDevice;
702            // Try to keep it snappy :)
703            QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
704            }
705            // MIDI device mapping.
706            QMap<int, int> midiDeviceMap;
707            piDeviceIDs = qsamplerDevice::getDevices(m_pClient, qsamplerDevice::Midi);
708            for (iDevice = 0; piDeviceIDs && piDeviceIDs[iDevice] >= 0; iDevice++) {
709                    ts << endl;
710                    qsamplerDevice device(this, qsamplerDevice::Midi, piDeviceIDs[iDevice]);
711                    // MIDI device specification...
712            ts << "# " << device.deviceTypeName() << " " << device.driverName()
713                       << " " << tr("Device") << " " << iDevice << endl;
714                    ts << "CREATE MIDI_INPUT_DEVICE " << device.driverName();
715                    qsamplerDeviceParamMap::ConstIterator deviceParam;
716                    for (deviceParam = device.params().begin();
717                                    deviceParam != device.params().end();
718                                            ++deviceParam) {
719                            const qsamplerDeviceParam& param = deviceParam.data();
720                            if (param.value.isEmpty()) ts << "# ";
721                            ts << " " << deviceParam.key() << "='" << param.value << "'";
722                    }
723                    ts << endl;
724                    // MIDI port parameters...
725                    int iPort = 0;
726                    for (qsamplerDevicePort *pPort = device.ports().first();
727                                    pPort;
728                                            pPort = device.ports().next(), ++iPort) {
729                            qsamplerDeviceParamMap::ConstIterator portParam;
730                            for (portParam = pPort->params().begin();
731                                            portParam != pPort->params().end();
732                                                    ++portParam) {
733                                    const qsamplerDeviceParam& param = portParam.data();
734                                    if (param.fix || param.value.isEmpty()) ts << "# ";
735                                    ts << "SET MIDI_INPUT_PORT_PARAMETER " << iDevice
736                                       << " " << iPort << " " << portParam.key()
737                                       << "='" << param.value << "'" << endl;
738                            }
739                    }
740                    // MIDI device index/id mapping.
741                    midiDeviceMap[device.deviceID()] = iDevice;
742            // Try to keep it snappy :)
743            QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
744            }
745            ts << endl;
746            // Sampler channel mapping.
747      QWidgetList wlist = m_pWorkspace->windowList();      QWidgetList wlist = m_pWorkspace->windowList();
748      for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {      for (int iChannel = 0; iChannel < (int) wlist.count(); iChannel++) {
749          qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);          qsamplerChannelStrip *pChannelStrip = (qsamplerChannelStrip *) wlist.at(iChannel);
750          if (pChannelStrip) {          if (pChannelStrip) {
751              qsamplerChannel *pChannel = pChannelStrip->channel();              qsamplerChannel *pChannel = pChannelStrip->channel();
752              if (pChannel) {              if (pChannel) {
753                  ts << "# Channel " << iChannel << endl;                  ts << "# " << tr("Channel") << " " << iChannel << endl;
754                  ts << "ADD CHANNEL" << endl;                  ts << "ADD CHANNEL" << endl;
755                  ts << "SET CHANNEL AUDIO_OUTPUT_TYPE " << iChannel << " " << pChannel->audioDriver() << endl;                  if (audioDeviceMap.isEmpty()) {
756                  ts << "SET CHANNEL MIDI_INPUT_TYPE " << iChannel << " " << pChannel->midiDriver() << endl;                          ts << "SET CHANNEL AUDIO_OUTPUT_TYPE " << iChannel
757              //  ts << "SET CHANNEL MIDI_INPUT_PORT " << iChannel << " " << pChannel->midiPort() << endl;                                              << " " << pChannel->audioDriver() << endl;
758                                } else {
759                            ts << "SET CHANNEL AUDIO_OUTPUT_DEVICE " << iChannel
760                                               << " " << audioDeviceMap[pChannel->audioDevice()] << endl;
761                                    }
762                    if (midiDeviceMap.isEmpty()) {
763                            ts << "SET CHANNEL MIDI_INPUT_TYPE " << iChannel
764                                           << " " << pChannel->midiDriver() << endl;
765                                } else {
766                            ts << "SET CHANNEL MIDI_INPUT_DEVICE " << iChannel
767                                               << " " << midiDeviceMap[pChannel->midiDevice()] << endl;
768                                }
769                    ts << "SET CHANNEL MIDI_INPUT_PORT " << iChannel
770                                   << " " << pChannel->midiPort() << endl;
771                  ts << "SET CHANNEL MIDI_INPUT_CHANNEL " << iChannel << " ";                  ts << "SET CHANNEL MIDI_INPUT_CHANNEL " << iChannel << " ";
772                  if (pChannel->midiChannel() == LSCP_MIDI_CHANNEL_ALL)                  if (pChannel->midiChannel() == LSCP_MIDI_CHANNEL_ALL)
773                      ts << "ALL";                      ts << "ALL";
# Line 689  bool qsamplerMainForm::saveSessionFile ( Line 805  bool qsamplerMainForm::saveSessionFile (
805  }  }
806    
807    
808    // Session change receiver slot.
809    void qsamplerMainForm::sessionDirty (void)
810    {
811        // Just mark the dirty form.
812        m_iDirtyCount++;
813        // and update the form status...
814        stabilizeForm();
815    }
816    
817    
818  //-------------------------------------------------------------------------  //-------------------------------------------------------------------------
819  // qsamplerMainForm -- File Action slots.  // qsamplerMainForm -- File Action slots.
820    
# Line 976  void qsamplerMainForm::viewMessages ( bo Line 1102  void qsamplerMainForm::viewMessages ( bo
1102  }  }
1103    
1104    
1105    // Show/hide the device configurator form.
1106    void qsamplerMainForm::viewDevices (void)
1107    {
1108        if (m_pOptions == NULL)
1109            return;
1110    
1111        if (m_pDeviceForm) {
1112            m_pOptions->saveWidgetGeometry(m_pDeviceForm);
1113                    m_pDeviceForm->setClient(m_pClient);
1114            if (m_pDeviceForm->isVisible()) {
1115                m_pDeviceForm->hide();
1116            } else {
1117                m_pDeviceForm->show();
1118                m_pDeviceForm->raise();
1119                m_pDeviceForm->setActiveWindow();
1120            }
1121        }
1122    }
1123    
1124    
1125  // Show options dialog.  // Show options dialog.
1126  void qsamplerMainForm::viewOptions (void)  void qsamplerMainForm::viewOptions (void)
1127  {  {
# Line 1000  void qsamplerMainForm::viewOptions (void Line 1146  void qsamplerMainForm::viewOptions (void
1146          bool    bOldDisplayEffect   = m_pOptions->bDisplayEffect;          bool    bOldDisplayEffect   = m_pOptions->bDisplayEffect;
1147          int     iOldMaxVolume       = m_pOptions->iMaxVolume;          int     iOldMaxVolume       = m_pOptions->iMaxVolume;
1148          QString sOldMessagesFont    = m_pOptions->sMessagesFont;          QString sOldMessagesFont    = m_pOptions->sMessagesFont;
1149            bool    bOldKeepOnTop       = m_pOptions->bKeepOnTop;
1150          bool    bOldStdoutCapture   = m_pOptions->bStdoutCapture;          bool    bOldStdoutCapture   = m_pOptions->bStdoutCapture;
1151          int     bOldMessagesLimit   = m_pOptions->bMessagesLimit;          int     bOldMessagesLimit   = m_pOptions->bMessagesLimit;
1152          int     iOldMessagesLimitLines = m_pOptions->iMessagesLimitLines;          int     iOldMessagesLimitLines = m_pOptions->iMessagesLimitLines;
# Line 1012  void qsamplerMainForm::viewOptions (void Line 1159  void qsamplerMainForm::viewOptions (void
1159          if (pOptionsForm->exec()) {          if (pOptionsForm->exec()) {
1160              // Warn if something will be only effective on next run.              // Warn if something will be only effective on next run.
1161              if (( bOldStdoutCapture && !m_pOptions->bStdoutCapture) ||              if (( bOldStdoutCapture && !m_pOptions->bStdoutCapture) ||
1162                  (!bOldStdoutCapture &&  m_pOptions->bStdoutCapture)) {                  (!bOldStdoutCapture &&  m_pOptions->bStdoutCapture) ||
1163                    ( bOldKeepOnTop     && !m_pOptions->bKeepOnTop)     ||
1164                    (!bOldKeepOnTop     &&  m_pOptions->bKeepOnTop)) {
1165                  QMessageBox::information(this, tr("Information"),                  QMessageBox::information(this, tr("Information"),
1166                      tr("Some settings may be only effective\n"                      tr("Some settings may be only effective\n"
1167                         "next time you start this program."), tr("OK"));                         "next time you start this program."), tr("OK"));
# Line 1168  void qsamplerMainForm::helpAbout (void) Line 1317  void qsamplerMainForm::helpAbout (void)
1317  void qsamplerMainForm::stabilizeForm (void)  void qsamplerMainForm::stabilizeForm (void)
1318  {  {
1319      // Update the main application caption...      // Update the main application caption...
1320      QString sSessioName = sessionName(m_sFilename);      QString sSessionName = sessionName(m_sFilename);
1321      if (m_iDirtyCount > 0)      if (m_iDirtyCount > 0)
1322          sSessioName += '*';          sSessionName += '*';
1323      setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessioName));      setCaption(tr(QSAMPLER_TITLE " - [%1]").arg(sSessionName));
1324    
1325      // Update the main menu state...      // Update the main menu state...
1326      qsamplerChannelStrip *pChannelStrip = activeChannelStrip();      qsamplerChannelStrip *pChannelStrip = activeChannelStrip();
# Line 1188  void qsamplerMainForm::stabilizeForm (vo Line 1337  void qsamplerMainForm::stabilizeForm (vo
1337      editSetupChannelAction->setEnabled(bHasChannel);      editSetupChannelAction->setEnabled(bHasChannel);
1338      editResetChannelAction->setEnabled(bHasChannel);      editResetChannelAction->setEnabled(bHasChannel);
1339      editResetAllChannelsAction->setEnabled(bHasChannel);      editResetAllChannelsAction->setEnabled(bHasChannel);
     channelsArrangeAction->setEnabled(bHasChannel);  
1340      viewMessagesAction->setOn(m_pMessages && m_pMessages->isVisible());      viewMessagesAction->setOn(m_pMessages && m_pMessages->isVisible());
1341        viewDevicesAction->setOn(m_pDeviceForm && m_pDeviceForm->isVisible());
1342        viewDevicesAction->setEnabled(bHasClient);
1343        channelsArrangeAction->setEnabled(bHasChannel);
1344    
1345      // Client/Server status...      // Client/Server status...
1346      if (bHasClient) {      if (bHasClient) {
1347          m_status[QSAMPLER_STATUS_CLIENT]->setText(tr("Connected"));          m_statusItem[QSAMPLER_STATUS_CLIENT]->setText(tr("Connected"));
1348          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));
1349      } else {      } else {
1350          m_status[QSAMPLER_STATUS_CLIENT]->clear();          m_statusItem[QSAMPLER_STATUS_CLIENT]->clear();
1351          m_status[QSAMPLER_STATUS_SERVER]->clear();          m_statusItem[QSAMPLER_STATUS_SERVER]->clear();
1352      }      }
1353      // Channel status...      // Channel status...
1354      if (bHasChannel)      if (bHasChannel)
1355          m_status[QSAMPLER_STATUS_CHANNEL]->setText(pChannelStrip->caption());          m_statusItem[QSAMPLER_STATUS_CHANNEL]->setText(pChannelStrip->caption());
1356      else      else
1357          m_status[QSAMPLER_STATUS_CHANNEL]->clear();          m_statusItem[QSAMPLER_STATUS_CHANNEL]->clear();
1358      // Session status...      // Session status...
1359      if (m_iDirtyCount > 0)      if (m_iDirtyCount > 0)
1360          m_status[QSAMPLER_STATUS_SESSION]->setText(tr("MOD"));          m_statusItem[QSAMPLER_STATUS_SESSION]->setText(tr("MOD"));
1361      else      else
1362          m_status[QSAMPLER_STATUS_SESSION]->clear();          m_statusItem[QSAMPLER_STATUS_SESSION]->clear();
1363    
1364      // Recent files menu.      // Recent files menu.
1365      m_pRecentFilesMenu->setEnabled(bHasClient && m_pOptions->recentFiles.count() > 0);      m_pRecentFilesMenu->setEnabled(bHasClient && m_pOptions->recentFiles.count() > 0);
# Line 1256  void qsamplerMainForm::updateSession (vo Line 1407  void qsamplerMainForm::updateSession (vo
1407                  QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);                  QApplication::eventLoop()->processEvents(QEventLoop::ExcludeUserInput);
1408          }          }
1409          m_pWorkspace->setUpdatesEnabled(true);          m_pWorkspace->setUpdatesEnabled(true);
1410            
1411            // Remember to refresh devices
1412            if (m_pDeviceForm)
1413                m_pDeviceForm->refreshDevices();
1414  }  }
1415    
1416    
# Line 1861  bool qsamplerMainForm::startClient (void Line 2016  bool qsamplerMainForm::startClient (void
2016      // Log success here.      // Log success here.
2017      appendMessages(tr("Client connected."));      appendMessages(tr("Client connected."));
2018    
2019            // Hard-notify device configuration form,
2020            // if visible, that we're ready...
2021            if (m_pDeviceForm && m_pDeviceForm->isVisible())
2022                m_pDeviceForm->setClient(m_pClient);
2023                
2024      // Is any session pending to be loaded?      // Is any session pending to be loaded?
2025      if (!m_pOptions->sSessionFile.isEmpty()) {      if (!m_pOptions->sSessionFile.isEmpty()) {
2026          // Just load the prabably startup session...          // Just load the prabably startup session...
# Line 1881  void qsamplerMainForm::stopClient (void) Line 2041  void qsamplerMainForm::stopClient (void)
2041      if (m_pClient == NULL)      if (m_pClient == NULL)
2042          return;          return;
2043    
2044            // Hard-notify device configuration form,
2045            // if visible, that we're running out...
2046            if (m_pDeviceForm && m_pDeviceForm->isVisible())
2047                m_pDeviceForm->setClient(NULL);
2048    
2049      // Log prepare here.      // Log prepare here.
2050      appendMessages(tr("Client disconnecting..."));      appendMessages(tr("Client disconnecting..."));
2051    

Legend:
Removed from v.409  
changed lines
  Added in v.487

  ViewVC Help
Powered by ViewVC