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